Backed out changeset e00d10064639 (bug 948269)
Backed out changeset 2ac8fe9a90c5 (bug 948269) for timeouts in gaia-integration tests; CLOSED TREE