UOA: Miscellaneous cleanups.
UOA: Return IMAP/SMTP user names when collecting user info.

Can't assume the user names are the same as the collection identity.

Would be better to specify this in the .service files.

   e.g. <imapuser>EMAILADDRESS / USERIDENTITY</imapuser>

But that can wait.  Hard-coding by provider is ugly but works for now.
UOA: Add support for IMAP access to Windows Live accounts.