Zabbix

.......... [DEV-1385] updated to the latest from master; resolved conflicts in:
 - frontends/php/app/views/layout.htmlpage.menu.php
 - frontends/php/include/config.inc.php