Merge the IMAP and ActiveSync mutation unit tests
Merge branch 'master' into merge-mutation-tests
Fix IMAP tests
Merge pull request #126 from mozsquib/merge-mutation-tests

Merge the IMAP and ActiveSync mutation unit tests. r=asuth