Backed out changesets bb126ac7b33d and 7bbc04988e85 (bug 861495) for webconsole mochitest timeouts.