Backed out 3 changesets (bug 941132, bug 941136, bug 961792) for breaking the Marionette harness. CLOSED TREE

Backed out changeset 301044380886 (bug 961792)
Backed out changeset 236a56500ef3 (bug 941132)
Backed out changeset 02130207774e (bug 941136)