Merge "Unify maven-bundle-plugin version at 2.4.0"