WELD-1477, WELD-1475 Changes to the OSGi bundle