Zabbix

.......... [ZBX-23435] updated to latest from master; resolved conflicts in
- ui/app/views/js/monitoring.dashboard.view.js.php
- ui/tests/selenium/items/testFormItem.php