Bug 985112 - Fix marionette-client@1.1.x
Merge pull request #17609 from KevinGrandon/bug_985112_marionette_client_1_1_x

Bug 985112 - Fix marionette-client@1.1.x