Merge branch '2015.8' into '2016.3'

No conflicts.

salt/modules/git.py

@@ -1898,7 +1898,8 @@ def init(cwd,
             separate_git_dir = str(separate_git_dir)
         command.append('--separate-git-dir={0}'.format(separate_git_dir))
     if shared is not None:
-        if isinstance(shared, six.integer_types):
+        if isinstance(shared, six.integer_types) \
+                and not isinstance(shared, bool):
             shared = '0' + str(shared)
         elif not isinstance(shared, six.string_types):
             # Using lower here because booleans would be capitalized when

salt/states/saltmod.py

@@ -516,6 +516,12 @@ def wait_for_event(
     '''
     ret = {'name': name, 'changes': {}, 'comment': '', 'result': False}
 
+    if __opts__.get('test'):
+        ret['comment'] = \
+            'Orchestration would wait for event \'{0}\''.format(name)
+        ret['result'] = None
+        return ret
+
     sevent = salt.utils.event.get_event(
             node,
             __opts__['sock_dir'],