BAP-6622: IMAP Sync failed with exception
Merge pull request #3211 from laboro/bug/BAP-6622

BAP-6622: IMAP Sync failed with exception
FG-78: Run insecure content from websockets when HTTPS used
- extend condition to handle cases of using wss when https is used
Merge pull request #3213 from laboro/fix/FG-78

FG-78: Run insecure content from websockets when HTTPS used
Merge remote-tracking branch 'remotes/dev/master'