Update to OSGi 5