Bug 942826 - Use marionette's new Wait() functionality;r=davehunt