Bug 1084288 - Refactor marionette.py script to avoid setting duplicate args r=jgriffin