ref #4203 - Email monitoring
ref #4203 - add circular-mail monitoring and mail-server monitoring
Merge branch 'master' into #4203-EmailsMonitoring

Conflicts:
	src/main/i18n/messages_fr.properties
	src/main/i18n/messages_it.properties
Merge branch '#4203-EmailsMonitoring'