.......... [ZBXNEXT-101] updated to the latest trunk. resolved conflicts in src/zabbix_proxy/proxy.c and src/zabbix_server/server.c