Bug 987838 - Intermittent failing test: Notification.get(): notifications should persist even after closing app
Bug 987838 - Fix lint errors due to disabling of intermittent test
Merge pull request #17344 from mcav/apop

Bug 983167 - [email/POP3] broken node-crypto.js shim causes auth failure...
Merge pull request #17572 from steveck-chung/bug-986465

Bug 986465 - [Messaging] In list of messages to delete, contact name overlaps the photo. r=borja(cherry picked from commit 0aaacfb35bc914814904a02a49e1abb9a56ac099)