Conflicts: maven-plugin/src/main/java/hudson/maven/MavenBuild.java test/src/test/java/hudson/maven/MavenBuildTest.java