Merge branch 'develop' of github.com:saltstack/salt into develop

doc/ref/clientacl.rst

@@ -24,14 +24,17 @@ specified user. This configuration is much like the ``peer`` configuration:
 Permission Issues
 =================
 
-Earlier versions of salt set overly restrictive permissions on some of the
-directories required for ``client_acl`` support. These directories will need
-to be manually modified if upgrading from an earlier version.
+Directories required for ``client_acl`` must be modified to be readable by the
+users specified:
+
+.. code-block:: bash
+
+    chmod 755 /var/cache/salt /var/cache/salt/jobs /var/run/salt
+
+If you are upgrading from earlier versions of salt you must also remove any
+existing user keys and re-start the Salt master:
 
 .. code-block:: bash
 
-    chmod 755 /var/cache/salt
-    chmod 755 /var/cache/salt/jobs
-    chmod 755 /var/run/salt
     rm /var/cache/salt/.*keys
     service salt-master restart

salt/utils/yaml.py

@@ -34,6 +34,9 @@ class CustomeConstructor(yaml.constructor.SafeConstructor):
             raise ConstructorError(None, None,
                     'expected a mapping node, but found {0}'.format(node.id),
                     node.start_mark)
+
+        self.flatten_mapping(node)
+
         mapping = {}
         for key_node, value_node in node.value:
             key = self.construct_object(key_node, deep=deep)