(cherry picked from commit 1fb2acfd)

Conflicts:

	core/src/main/java/hudson/model/AbstractProject.java
	core/src/main/java/hudson/model/ParametersDefinitionProperty.java