Backout changesets 654a3fc28fa2 and 88fefd05fb64 (bug 1017862) for Cpp and mochitest failures on a CLOSED TREE. r=bustage