Bug 927475 - update marionette client
Merge pull request #12841 from lightsofapollo/break-the-world

update marionette client