Backed out changeset a3bdc9a0259f (bug 854288) for xpcshell failures.
Bug 858893 - Follow-up to fix B2G bustage on a CLOSED TREE.