Merge pull request #18773 from jrburke/bug1002932-email-stamp-cache-minify

Bug 1002932 - [email] cookie cache no longer working with GAIA_OPTIMIZE=1 r=asuth