Merge pull request #42548 from gtmanfred/2017.7.1

pass in empty kwarg for reactor

salt/state.py

@@ -577,8 +577,6 @@ class Compiler(object):
                 if '__env__' in body:
                     chunk['__env__'] = body['__env__']
                 chunk['__id__'] = name
-                chunk['arg'] = []
-                chunk['kwarg'] = {}
                 for arg in run:
                     if isinstance(arg, six.string_types):
                         funcs.add(arg)
@@ -591,7 +589,7 @@ class Compiler(object):
                                         names.append(_name)
                                 continue
                             else:
-                                chunk['kwarg'].update(arg)
+                                chunk.update(arg)
                 if names:
                     name_order = 1
                     for entry in names:

salt/utils/reactor.py

@@ -273,6 +273,8 @@ class ReactWrap(object):
         try:
             f_call = salt.utils.format_call(l_fun, low)
             kwargs = f_call.get('kwargs', {})
+            if 'kwarg' not in kwargs:
+                kwargs['kwarg'] = {}
 
             # TODO: Setting the user doesn't seem to work for actual remote publishes
             if low['state'] in ('runner', 'wheel'):