Merge branch 'master' of https://github.com/jenkinsci/jenkins into JENKINS-3539

Conflicts:
	test/src/test/java/hudson/model/ParametersTest.java