MULE-7620 Modifications to improve fix for MULE-7620
Partial backport of the commit 4cfafe302603db788cb8bd86fe569b77beb5c854
Brings back the disabling of registration of outbound endpoints