This reverts commit edd1a65.
I don't even want to look at the `git blame` for this.
This patch limits changes to the mkt branch. * Adds email to the page user info block. * Waits for persona initialization * updated test_helpers to include new value * added r fixes * added legacy account csrf handler