Zabbix

.......... [ZBXNEXT-4942] updated to the latest from master; resolved conflicts in:
 - create/src/schema.tmpl
 - create/src/templates.tmpl
 - frontends/php/include/defines.inc.php
 - src/libs/zbxdbupgrade/dbupgrade_4030.c