Remove unused osgi imports that are causing issues on Karaf4
Update features to work with Karaf 4