Merge pull request #24600 from basepi/salt-ssh.orchestrate.20615

[2015.5] Remove __kwarg__ from salt-ssh keyword args

salt/client/ssh/__init__.py

@@ -1219,6 +1219,8 @@ def _convert_args(args):
     for arg in args:
         if isinstance(arg, dict):
             for key in list(arg.keys()):
+                if key == '__kwarg__':
+                    continue
                 converted.append('{0}={1}'.format(key, arg[key]))
         else:
             converted.append(arg)