Bug 1033402 - waitForSocket() before connecting to marionette.

Also, ````waitForASync```` still have bits specific to the client. The refactor you want me to do who lead to more complexity then the trivial code we currently have.