Merge "Do not duplicate OSGi dependencyManagement"