Backed out changesets bb7097d12256, 5e6c7217e92a, and 6779278f87df (bug 884573) and changeset 30e1a793fbf9 (bug 878941) for Cpp unit test failures.