Backed out changeset 4a8eb498c244 (bug 972087) for potentially breaking the build on a CLOSED TREE
Backed out 2 changesets (bug 969382) for potentially breaking the build on a CLOSED TREE

Backed out changeset 70fcde1101a1 (bug 969382)
Backed out changeset 8eb38600d76a (bug 969382)
Automatic merge