Zabbix

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

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