Zabbix

.......... [DEV-2176] updated to latest master, resolved conlicts

 Conflicts:
	src/libs/zbxmedia/email.c
	src/zabbix_server/discoverer/discoverer.c
	src/zabbix_server/poller/checks_agent.c
	src/zabbix_server/poller/checks_agent.h
	src/zabbix_server/poller/checks_internal.c
	src/zabbix_server/poller/checks_ssh.c
	src/zabbix_server/poller/checks_ssh.h
	src/zabbix_server/poller/checks_telnet.c
	src/zabbix_server/poller/checks_telnet.h
	src/zabbix_server/poller/poller.c
	src/zabbix_server/poller/ssh2_run.c
	src/zabbix_server/poller/ssh_run.c
	src/zabbix_server/poller/ssh_run.h
	src/zabbix_server/poller/telnet_run.c
	src/zabbix_server/poller/telnet_run.h
	src/zabbix_server/scripts/scripts.c
	tests/zabbix_server/poller/test_get_value_ssh.c
	tests/zabbix_server/poller/test_get_value_telnet.c