Revert "Assert that wait_other_notice and join_ring are not used together"
Revert "Assert that wait_other_notice and join_ring are not used together"

tolbertam/ccm,bcantoni/ccm,mike-tr-adamson/ccm,bcantoni/ccm,thobbs/ccm,pcmanus/ccm,thobbs/ccm,mike-tr-adamson/ccm,mike-tr-adamson/ccm,mikefero/ccm,pcmanus/ccm,tolbertam/ccm,mikefero/ccm,pcmanus/ccm