Zabbix

..F....... [ZBXNEXT-8444] updated to latest from master; resolved conflicts in:
- ui/app/partials/configuration.host.edit.html.php
- ui/app/views/template.list.php
- ui/include/views/configuration.template.edit.php
- ui/include/views/js/configuration.httpconf.edit.js.php
- ui/templates.php