Merge "Partial revert "Switch build to Apache Felix maven-bundle-plugin""