Zabbix

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

- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_7050.c
- ui/app/views/configuration.host.list.php
- ui/app/views/template.list.php
- ui/include/classes/mvc/CRouter.php
- ui/include/defines.inc.php
- ui/host_discovery_prototypes.php
- ui/host_discovery.php