Zabbix

.......... [DEV-2324] updated to latest master

 Conflicts:
	src/zabbix_agent/zabbix_agentd.c
	src/zabbix_proxy/proxy.c
	src/zabbix_server/discoverer/discoverer.c
	src/zabbix_server/poller/checks_agent.c
	src/zabbix_server/poller/checks_snmp.c
	src/zabbix_server/poller/checks_snmp.h
	src/zabbix_server/poller/poller.c
	src/zabbix_server/server.c