Zabbix

.......... [ZBXNEXT-4731] merged from latest ^/trunk; resolved conflicts in:
 - frontends/php/templates.php;
 - frontends/php/include/views/configuration.host.list.php
 - frontends/php/include/views/configuration.template.list.php
 - frontends/php/include/views/js/configuration.host.list.js.php