Merge "Add imap2 to the build" into jb-mr1-dev