Zabbix

.......... [ZBXNEXT-6478] updated to the master branch; resolved conflicts in:
  - create/src/schema.tmpl
  - src/libs/zbxdbupgrade/dbupgrade_5030.c
  - ui/app/views/popup.generic.php
  - ui/include/classes/mvc/CRouter.php
  - ui/include/defines.inc.php
  - ui/include/schema.inc.php