Backed out changeset e4c57f58a0ad (bug 956739) for changing Marionette failure output in a TBPL-unfriendly way.