Merge branch 'security' into stable-1.580

Conflicts:
	.idea/compiler.xml
	.idea/encodings.xml
	core/pom.xml
	core/src/main/java/hudson/Functions.java
	core/src/main/java/hudson/markup/MyspacePolicy.java
	core/src/main/java/hudson/model/AbstractItem.java
	core/src/main/java/hudson/security/ACL.java
	core/src/main/java/hudson/util/RobustReflectionConverter.java
	core/src/main/resources/lib/layout/layout.jelly
	pom.xml
	test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java
	test/src/main/java/org/jvnet/hudson/test/JenkinsRule.java
	test/src/test/groovy/hudson/cli/BuildCommandTest.groovy
	test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
	test/src/test/groovy/hudson/model/AbstractProjectTest.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/CaseResultTest.java
	test/src/test/java/hudson/tasks/junit/JUnitResultArchiverTest.java
	war/pom.xml