Slight refactoring of migrateAccount for better stats.  Adding resetting of authToken.

Change-Id: I72aba3594ebd19d92bac66e84d5c1b6ffb45fd95
Merge "Slight refactoring of migrateAccount for better stats.  Adding resetting of authToken."