Backed out changeset 229cd2ebe225 (bug 855108) for intermittent mochitest-bc failures
merge m-c to fx-team