Zabbix

.......... [ZBXNEXT-6945] updated to latest from master; solved conflicts in:

- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_5050.c
- ui/include/defines.inc.php