Bug 956787 - Merge the email tests where we can
Merge pull request #15116 from viorelaioia/bug_956787

Bug 956787 - Merge the email tests where we can