Bug 816610 - Fix unit tests
Merge pull request #8144 from KevinGrandon/bug_841251_fix_unit_tests

Bug 816610 - Just fixing tests, r=me.
Bug 841251 - Fix email tests.
Merge pull request #8146 from KevinGrandon/bug_841251_fix_unit_tests

Bug 841251 - Simple fix for email tests r=me
Merge branch 'master' into travis-test