Merged ce27914c

Conflicts:
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/model/AbstractProject.java
	core/src/main/java/hudson/model/Descriptor.java
	core/src/main/java/hudson/model/Hudson.java
	core/src/main/java/hudson/tasks/BuildTrigger.java
	core/src/main/resources/hudson/model/View/newJob.jelly
	core/src/main/resources/hudson/model/View/sidepanel.jelly
	core/src/main/resources/hudson/views/Messages_ja.properties
	maven-plugin/src/main/java/hudson/maven/MavenBuild.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifact.java
	maven-plugin/src/main/java/hudson/maven/reporters/MavenArtifactRecord.java