Make callback detection channels non-global
Make callback detection channels non-global

neiljerram/felix,matthewdupre/felix,matthewdupre/felix,neiljerram/felix,neiljerram/felix,Metaswitch/calico,neiljerram/felix,Metaswitch/calico