Zabbix

.......... [ZBXNEXT-9546] updated to the latest from 'master'; resolved conflicts in:
- ui/app/controllers/CControllerHostEdit.php
- ui/app/controllers/CControllerTemplateEdit.php
- ui/app/partials/configuration.tags.tab.php
- ui/app/views/item.edit.php
- ui/app/views/item.prototype.edit.php
- ui/app/views/js/host.edit.js.php
- ui/app/views/js/template.edit.js.php
- ui/assets/styles/blue-theme.css
- ui/assets/styles/dark-theme.css
- ui/assets/styles/hc-dark.css
- ui/assets/styles/hc-light.css
- ui/include/views/configuration.httpconf.edit.php