mu-configure in cloud-mu-3.0.2

- old
+ new

@@ -105,10 +105,16 @@
     "required" => true,
     "rootonly" => true,
     "desc" => "The local system's value for HOSTNAME",
     "changes" => ["chefrun", "hostname"]
   },
+  "disable_mommacat" => {
+    "title" => "Disable Momma Cat",
+    "default" => false,
+    "desc" => "Disable the Momma Cat grooming daemon. Nodes which require asynchronous Ansible/Chef bootstraps will not function. This option is only honored in gem-based installations.",
+    "boolean" => true
+  },
   "mommacat_port" => {
     "title" => "Momma Cat Listen Port",
     "pattern" => /^[0-9]+$/i,
     "default" => 2260,
     "required" => $IN_GEM,
@@ -802,10 +808,10 @@
   end
 
   # Converts the current $CONFIGURABLES object to a Hash suitable for merging
   # with $MU_CFG.
   def setConfigTree(tree = $CONFIGURABLES)
-    cfg = {}
+    cfg = $MU_CFG.nil? ? {} : $MU_CFG.dup
     tree.each_pair { |key, data|
       next if !AMROOT and data['rootonly']
       if data.has_key?("subtree")
         if data["named_subentries"]
           if data["subtree"]["#entries"]