Merge "Allow SONAR_MAVEN_GOAL to be configurable"