Back out eb5f24ea495b (bug 950266) for marionette-webapi and debug mochitest-6 bustage