Zabbix

..F....... [ZBXNEXT-7410] updated to latest from master; resolved conflict in:
- ui/app/partials/js/configuration.host.edit.html.js.php
- ui/app/views/configuration.host.edit.php
- ui/app/views/js/configuration.host.edit.js.php
- ui/app/views/js/popup.host.edit.js.php
- ui/app/views/js/popup.massupdate.tmpl.js.php
- ui/app/views/js/popup.valuemap.edit.js.php
- ui/app/views/popup.host.edit.php
- ui/assets/styles/hc-light.css
- ui/include/views/js/configuration.host.prototype.edit.js.php
- ui/tests/selenium/permissions/testPermissionsWithoutCSRF.php