Merge "Removed BundleContext from Broker.register{Consumer,Provider}"