OC-410: Wrong IMAP Query
- code style fixes
- imap sync algo fix
BAP-498: Investigate failed builds
 - CR changes
OC-410: Wrong IMAP Query

- fix cr
Merge pull request #2567 from laboro/ticket/OC-410

OC-410: Wrong IMAP Query
Merge remote-tracking branch 'remotes/dev/master'