Merge remote branch 'autotest-upstream/master' into autotest-merge

frontend/client/src/autotest/afe/create/CreateJobViewPresenter.java

 package autotest.afe.create;
 
 import autotest.afe.AfeUtils;
 import autotest.afe.CheckBoxPanel;
 import autotest.afe.ControlTypeSelect;
 import autotest.afe.HostSelector;
 import autotest.afe.IButton;
 import autotest.afe.ICheckBox;
 import autotest.afe.ITextArea;
 import autotest.afe.ITextBox;
@@ skipping 139 matching lines @@
 
         display.getSkipVerify().setValue(!jobObject.get("run_verify").isBoolean().booleanValue());
         rebootBefore.setSelectedChoice(Utils.jsonToString(jobObject.get("reboot_before")));
         rebootAfter.setSelectedChoice(Utils.jsonToString(jobObject.get("reboot_after")));
         display.getParseFailedRepair().setValue(
                 jobObject.get("parse_failed_repair").isBoolean().booleanValue());
         display.getHostless().setValue(cloneObject.get("hostless").isBoolean().booleanValue());
         if (display.getHostless().getValue()) {
             hostSelector.setEnabled(false);
         }
-        if (cloneObject.get("drone_set").isNull() == null) {
-            display.getDroneSet().selectByName(Utils.jsonToString(cloneObject.get("drone_set")));
+
+        if (staticData.getData("drone_sets_enabled").isBoolean().booleanValue()) {
+            if (cloneObject.get("drone_set").isNull() == null) {
+                display.getDroneSet().selectByName(Utils.jsonToString(cloneObject.get("drone_set")));
+            }
         }
 
         controlTypeSelect.setControlType(
                 jobObject.get("control_type").isString().stringValue());
         display.getSynchCountInput().setText(Utils.jsonToString(jobObject.get("synch_count")));
         setSelectedDependencies(jobObject.get("dependencies").isArray());
         display.getControlFile().setText(
                 jobObject.get("control_file").isString().stringValue());
         controlReadyForSubmit = true;
 
@@ skipping 519 matching lines @@
         setRebootSelectorDefault(rebootBefore, "reboot_before");
         setRebootSelectorDefault(rebootAfter, "reboot_after");
         selectPreferredDroneSet();
         testSelector.reset();
     }
 
     private boolean parameterizedJobsEnabled() {
         return staticData.getData("parameterized_jobs").isBoolean().booleanValue();
     }
 }