Bug 937955 - use marionette client with bigger timeouts
Merge pull request #13716 from mikehenrty/bug-937955-marionette-client

Bug 937955 - use marionette client with bigger timeouts