Zabbix

.......... [ZBX-21618] updated to latest from release/7.0; resolved conflicts in:
- ui/include/views/configuration.graph.list.php
- ui/include/views/configuration.host.discovery.list.php