ISPN-4942 Make uber jars compatible with OSGi