Zabbix

.......... [ZBXNEXT-8486] updated to latest master; fixed merge conflicts in:
 - ui/js/menupopup.js
 - ui/app/views/js/search.js.php
 - ui/include/views/js/tr_events.js.php
 - ui/app/views/js/popup.host.edit.js.php
 - ui/include/classes/mvc/CLegacyAction.php
 - ui/app/views/js/monitoring.map.view.js.php
 - ui/app/views/js/monitoring.web.view.js.php
 - ui/app/views/js/monitoring.host.view.js.php
 - ui/app/views/js/configuration.host.edit.js.php
 - ui/app/views/js/configuration.host.list.js.php
 - ui/app/views/js/monitoring.problem.view.js.php
 - ui/include/views/js/inventory.host.view.js.php
 - ui/app/views/js/reports.toptriggers.list.js.php
 - ui/app/views/js/monitoring.dashboard.view.js.php
 - ui/app/views/js/configuration.hostgroup.list.js.php
 - ui/include/views/js/configuration.graph.edit.js.php
 - ui/include/views/js/configuration.graph.list.js.php
 - ui/app/views/js/monitoring.host.dashboard.view.js.php
 - ui/app/partials/js/configuration.host.edit.html.js.php
 - ui/include/views/configuration.host.discovery.edit.php
 - ui/include/views/configuration.item.prototype.list.php
 - ui/include/views/js/configuration.httpconf.edit.js.php
 - ui/include/views/js/configuration.httpconf.list.js.php
 - ui/include/views/js/configuration.host.discovery.edit.js.php
 - ui/include/views/js/configuration.host.discovery.list.js.php
 - ui/include/views/js/configuration.host.prototype.list.js.php
 - ui/include/views/js/configuration.item.prototype.list.js.php