Merge pull request #17344 from mcav/apop

Bug 983167 - [email/POP3] broken node-crypto.js shim causes auth failure...