Use email address rather than username in keyring: Bug #714689

Since different email accounts can have the same username, use the
full email address for the keyring to prevent collisions.  This patch
will also migrate both username-based keys and the very early one-pw
keys (from 0.1).