Zabbix

.......P.. [DEV-2326] updated to latest master

Conflicts:
	src/zabbix_proxy/proxy.c
	src/zabbix_server/vmware/vmware.c
	src/zabbix_server/vmware/vmware.h
	src/zabbix_server/vmware/vmware_manager.c
	src/zabbix_server/vmware/vmware_rest.c