Bug 1077649 - -e on gaia-marionette + fixes to which command so its safe to fail