.......... [ZBXNEXT-2203] updated to the latest trunk (resolved conflicts in create/src/schema.tmpl, frontends/php/include/defines.inc.php, src/libs/zbxdbupgrade/dbupgrade_2030.c, src/libs/zbxsysinfo/aix/proc.c, src/libs/zbxsysinfo/win32/swap.c, src/zabbix_server/trapper/nodecommand.c, src/zabbix_server/trapper/trapper.c, src/zabbix_server/proxypoller/proxypoller.c)