Add config option to specify IMAP connection socket parameters - imap_conn_options (#1489948)

Conflicts:
	CHANGELOG