Templating works better if it has the right placeholder (bug 1083606)
Merge pull request #561 from muffinresearch/fix-template-for-terms

Templating works better if it has the right placeholder (bug 1083606)
start session based on marketplace JWT buyer id (bug 1079529)
Merge pull request #562 from washort/1079529

put buyer email in session for Marketplace purchases
Set was_reverified on FxA auth (bug 1085773)