Merge pull request #1600 from mozilla/issue1599

cleanup transitional code for migration from email to userid in stage table

r+ - nice cleanup @lloyd!  Tests run, verified by creating new users and adding users to existing account.

close #1599