Bug 959217 - Switch tests to the new Marionette Wait class (refine dhunt's pull)