Merge branch 'security' into security-rc

Conflicts:
	test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
	test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
	test/src/test/groovy/hudson/model/UpdateCenter2Test.groovy
	test/src/test/java/hudson/model/UpdateSiteTest.java
	test/src/test/java/hudson/tasks/FingerprinterTest.java
	test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java