Backed out changeset b1745baf8dbc
Bug 1035551 - Add a config in tree for marionette tests.