Backed out changeset 5c6a41cf65df (bug 958773) for marionette-webapi test failures
Merge mozilla-central and fx-team