Zabbix

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

 Conflicts:
	configure.ac
	src/libs/zbxcacheconfig/dbconfig.c
	src/zabbix_proxy/Makefile.am
	src/zabbix_proxy/proxy.c
	src/zabbix_server/proxypoller/proxypoller.c
	src/zabbix_server/trapper/proxydata.c