Zabbix

.......... [ZBXNEXT-9850] updated to latest from master; resolved conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_7030.c
- ui/include/defines.inc.php
- ui/include/views/js/configuration.graph.edit.js.php