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

* commit 'acf206bc5eb78b432d19b3f200d9d6e3ff8e4361':
  Add imap2 to the build