Conflicts:
	core/src/main/java/jenkins/model/Jenkins.java
	test/src/test/java/hudson/bugs/JnlpAccessWithSecuredHudsonTest.java