...G...PS. [ZBXNEXT-101] updated to the latest trunk. resolved conflicts in include/log.h include/zbxtypes.h src/zabbix_proxy/housekeeper/housekeeper.c src/zabbix_proxy/proxy.c src/zabbix_server/housekeeper/housekeeper.c src/zabbix_server/httppoller/httptest.c src/zabbix_server/server.c src/zabbix_server/vmware/vmware.c
.......... [ZBX-8616] merge from 2.2