Bug 1053629 - Reduce complexity of setTextContent
Merge pull request #22864 from zbraniecki/1053629-simplify-settextcontent

Bug 1053629 - Reduce complexity of setTextContent. r=stas
Bug 1069412 - Email constantly asks me to reauthenticate
Merge pull request #24407 from jrburke/bug1069412-email-xoauth2-reauth

Bug 1069412 - Email constantly asks me to reauthenticate r=asuth