Zabbix

.......... [ZBXNEXT-7410] updated to latest from master. Resolved conflicts in:
 - ui/app/controllers/CControllerHostCreate.php
 - ui/app/controllers/CControllerHostEdit.php
 - ui/app/controllers/CControllerHostUpdate.php
 - ui/app/controllers/CControllerHostUpdateGeneral.php
 - ui/app/partials/configuration.valuemap.php
 - ui/app/partials/js/configuration.host.edit.html.js.php
 - ui/app/views/js/configuration.host.edit.js.php
 - ui/app/views/js/popup.host.edit.js.php
 - ui/js/hostmacrosmanager.js