Merge "Proper IMAP logout" into nyc-mr1-dev