Merge "Cleanup dependencyManagement overrides"