Bug 937935 - fix bin/gaia-marionette
Merge pull request #13641 from lightsofapollo/jamesisbad

Bug 937935 - fix bin/gaia-marionette +shepherd