Bug 1077649 - -e on gaia-marionette + fixes to which command so its safe to fail
Merge pull request #24796 from lightsofapollo/bug-1077649-revert-revert

Bug 1077649