Removed BundleContext from Broker.register{Consumer,Provider} (Part 2)