Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop

Conflicts:
    doc/ref/modules/all/salt.modules.yumpkg.rst
    salt/modules/yumpkg.py

doc/ref/modules/all/index.rst

@@ -287,6 +287,7 @@ Full list of builtin execution modules
     service
     shadow
     slack_notify
+    slsutil
     smartos_imgadm
     smartos_virt
     smartos_vmadm

doc/ref/modules/all/salt.modules.yumpkg.rst

@@ -4,4 +4,4 @@ salt.modules.yumpkg
 
 .. automodule:: salt.modules.yumpkg
     :members:
-    :exclude-members: available_version, groupinstall, list_updates
+    :exclude-members: available_version, groupinstall, list_updates, get_locked_packages

salt/modules/reg.py

@@ -362,6 +362,7 @@ def set_value(hive,
                 or vtype == registry.vtype['REG_BINARY']:
             vdata = str(vdata)
         _winreg.SetValueEx(handle, vname, 0, vtype, vdata)
+        _winreg.FlushKey(handle)
         _winreg.CloseKey(handle)
         return True
     except (WindowsError, ValueError, TypeError) as exc:  # pylint: disable=E0602

salt/modules/slsutil.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+'''
+Utility functions for use with or in SLS files
+'''
+from __future__ import absolute_import
+
+from salt.utils.dictupdate import merge, update
+
+update.__doc__ = update.__doc__ + '''\
+
+CLI Example:
+
+.. code-block:: shell
+
+    salt '*' slsutil.update '{foo: Foo}' '{bar: Bar}'
+
+'''
+
+merge.__doc__ = '''\
+Merge a data structure into another by choosing a merge strategy
+
+Strategies:
+
+* aggregate
+* list
+* overwrite
+* recurse
+* smart
+
+CLI Example:
+
+.. code-block:: shell
+
+    salt '*' slsutil.merge '{foo: Foo}' '{bar: Bar}'
+'''