JDKs were not loaded from disk

core/src/main/java/jenkins/model/Jenkins.java

@@ -3354,8 +3354,6 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
 
             systemMessage = Util.nullify(req.getParameter("system_message"));
 
-            setJDKs(req.bindJSONToList(JDK.class, json.get("jdks")));
-
             boolean result = true;
             for (Descriptor<?> d : Functions.getSortedDescriptorsForGlobalConfigUnclassified())
                 result &= configureDescriptor(req,json,d);

core/src/main/resources/jenkins/tools/GlobalToolConfiguration/index.groovy

-package hudson.security.GlobalToolConfiguration
+package jenkins.tools.GlobalToolConfiguration
 
 import hudson.Functions
 import hudson.model.Descriptor

test/src/test/java/hudson/model/HudsonTest.java

@@ -89,6 +89,10 @@ public class HudsonTest {
         HtmlPage configPage = j.createWebClient().goTo("configure");
         HtmlForm form = configPage.getFormByName("config");
         j.submit(form);
+        // Load tools page and resubmit too
+        HtmlPage toolsConfigPage = j.createWebClient().goTo("configureTools");
+        HtmlForm toolsForm = toolsConfigPage.getFormByName("config");
+        j.submit(toolsForm);
 
         // make sure all the pieces are intact
         assertEquals(2, j.jenkins.getNumExecutors());