Zabbix

.......... [ZBXNEXT-7410] updated to latest from master.

Resolved conflicts:
- ui/app/controllers/CControllerHostEdit.php
- ui/app/controllers/CControllerHostUpdateGeneral.php
- ui/app/views/js/configuration.host.edit.js.php
- ui/app/views/js/popup.host.edit.js.php
- ui/host_prototypes.php
- ui/include/classes/html/CMultiSelect.php
- ui/include/hosts.inc.php