Zabbix

.......... [ZBXNEXT-9851] updated to latest from master; resolved conflicts in

- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_7050.c
- ui/app/views/js/item.edit.js.php
- ui/app/views/js/item.prototype.list.js.php
- ui/include/views/js/configuration.host.discovery.edit.js.php
- ui/include/views/configuration.host.discovery.edit.php
- ui/include/views/configuration.host.discovery.prototype.edit.php
- ui/include/defines.inc.php