Merge pull request #11837 from asutherland/email-regex-fix

Bug 910153 - [Email] email address in a plain message body is broken, when multiple sub domains present. r=mcav, r=psingapati(cherry picked from commit 40f43a0b0e25b0cdeb6e7c82387d1fd2517c1ac6)
Merge pull request #11835 from kk1fff/b891443/p1

Bug 891443 - avoid redirecting every url started with https://www.mozilla.org in FTU, r=alive, a=leo+(cherry picked from commit 92b79a2dfe09d950e3789247a21e13083116ec0a)