Zabbix

.......... [ZBXNEXT-7410] updated to latest from master. Resolved conflicts in:
 - ui/app/partials/configuration.host.interface.row.php
 - ui/app/partials/hostmacros.inherited.list.html.php
 - ui/app/views/template.edit.php
 - ui/app/views/trigger.edit.php
 - ui/app/views/trigger.prototype.edit.php
 - ui/include/classes/html/CNumericBox.php
 - ui/include/views/configuration.httpconf.edit.php
 - ui/js/defines.js