Bug 1444152 - [test] Fix regression running marionette tests with |mach test|, r=whimboo

There were two issues:
1) The mach command name in resolve.py was wrong.
2) The marionette harness uses deepcopy on the passed in kwargs and sometimes
the 'log' argument that testing/mach_commands.py was passing in can be a class
instance (which can't be deepcopied).

MozReview-Commit-ID: 5gPxuiHs3dY

--HG--
extra : rebase_source : 63bc9c84fdcb540862f1dcbc2654bf5729e0dec8

testing/marionette/mach_commands.py

@@ -51,13 +51,13 @@ def run_marionette(tests, binary=None, topsrcdir=None, **kwargs):
     args = argparse.Namespace(tests=tests)
 
     args.binary = binary
+    args.logger = kwargs.pop('log', None)
 
     for k, v in kwargs.iteritems():
         setattr(args, k, v)
 
     parser.verify_usage(args)
 
-    args.logger = kwargs.get('log')
     if not args.logger:
         args.logger = commandline.setup_logging("Marionette Unit Tests",
                                                 args,

testing/mozbase/moztest/moztest/resolve.py

@@ -56,7 +56,7 @@ TEST_SUITES = {
     },
     'marionette': {
         'aliases': ('mn',),
-        'mach_command': 'marionette',
+        'mach_command': 'marionette-test',
         'kwargs': {'tests': None},
     },
     'mochitest-a11y': {