Backed out changeset 1bbb71449bf1 (bug 1035551)
Bug 1035551 - Add a config in tree for marionette tests.;r=ahal