Fix ordering of RebidOneNotrumpByOpener and ForcedRebidOriginalSuitByOpener