Merge branch '2017.7.1' into '2017.7'

No conflicts.

salt/netapi/rest_tornado/__init__.py

@@ -115,6 +115,7 @@ def start():
             ssl_opts.update({'keyfile': mod_opts['ssl_key']})
         kwargs['ssl_options'] = ssl_opts
 
+    import tornado.httpserver
     http_server = tornado.httpserver.HTTPServer(get_application(__opts__), **kwargs)
     try:
         http_server.bind(mod_opts['port'],

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 'arg' not in kwargs:
+                kwargs['arg'] = []
             if 'kwarg' not in kwargs:
                 kwargs['kwarg'] = {}