code fix and test fix for: https://issues.apache.org/jira/browse/AMQ-4225 NetworkBridge MBeans weren't getting registered because of changes in the Broker MBean naming.