Some defensive code added to the OsgiObjectFactory, moved bundleContext injection into the Servlet Context out to a separate bundle