Zabbix

.......... [ZBXNEXT-4413] updated to the latest trunk; fixed conflicts in:

 - frontends/php/include/triggers.inc.php
 - frontends/php/include/views/inventory.host.view.php
 - frontends/php/js/menupopup.js
 - create/src/schema.tmpl
 - frontends/php/include/defines.inc.php
 - src/libs/zbxdbupgrade/dbupgrade_3050.c
 - frontends/php/include/classes/helpers/CMenuPopupHelper.php