Bug 1033402 - Update marionette client and marionette device host.
Merge pull request #57 from hfiguiere/bug1033402-2

Bug 1033402 - Update marionette client and marionette device host. r=kgrandon