Merge branch 'security' into security-rc

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

test/src/test/java/hudson/model/UpdateCenter2Test.java

@@ -46,7 +46,7 @@ public class UpdateCenter2Test {
     @RandomlyFails("SocketTimeoutException from goTo due to GET http://localhost:…/update-center.json?…")
     @Test public void install() throws Exception {
         UpdateSite.neverUpdate = false;
-        j.createWebClient().goTo(""); // load the metadata
+        j.jenkins.pluginManager.doCheckUpdatesServer(); // load the metadata
         DownloadJob job = (DownloadJob) j.jenkins.getUpdateCenter().getPlugin("changelog-history").deploy().get(); // this seems like one of the smallest plugin
         System.out.println(job.status);
         assertTrue(job.status instanceof Success);