Merge branch '2015.5' into '2015.8'

Conflicts:
  - salt/modules/saltutil.py

salt/modules/puppet.py

@@ -241,7 +241,7 @@ def disable(message=None):
     .. code-block:: bash
 
         salt '*' puppet.disable
-        salt '*' puppet.disable 'disabled for a good reason'
+        salt '*' puppet.disable 'Disabled, contact XYZ before enabling'
     '''
 
     _check_puppet()

salt/modules/saltutil.py

@@ -94,6 +94,7 @@ def _sync(form, saltenv=None):
     remote = set()
     source = salt.utils.url.create('_' + form)
     mod_dir = os.path.join(__opts__['extension_modules'], '{0}'.format(form))
+    cumask = os.umask(0o77)
     if not os.path.isdir(mod_dir):
         log.info('Creating module dir {0!r}'.format(mod_dir))
         try:
@@ -168,6 +169,7 @@ def _sync(form, saltenv=None):
             os.remove(os.path.join(__opts__['cachedir'], 'grains.cache.p'))
         except OSError:
             log.error('Could not remove grains cache!')
+    os.umask(cumask)
     return ret