Bug 956648 - Remove timeouts from tests r=julienw
Merge pull request #15422 from KevinGrandon/bug_956648_remove_test_timeouts

Bug 956648 - Remove timeouts from tests
Merge branch 'master' into bug958675-email-upgrade-alameda