bumping marionette client, increase waitFor timeout
Merge pull request #13634 from mikehenrty/bug-936485-marionette-bump

bumping marionette client, increase waitFor timeout, r=lightsofapollo