Bug 947001 - bump marionette-client and gaiatest versions

Once https://bugzilla.mozilla.org/show_bug.cgi?id=925398 lands, then we'll need to update the marionette client used and the gaiatest version