Backed out changeset 1f6450d61d3f (bug 975792)
Backed out changeset 49a1923db9be (bug 975792) for frequent robocop failures
Merge mozilla-central and inbound