Merge proposals dependent on lp://qastaging/~sharoonthomas/poweremail/v6-imap-select-folder-fixed

1. v6-imap-select-folder-fixed
2. Dependent merge proposals