Fix some caes of 2N invitational rebid.  However this unearthed a priority problem where we are preferring a forced NoTrumpToPlay over ForcedRebidOriginalSuitByOpener