More changes to osgi bundles and pom configurations