Zabbix

.......... [ZBXNEXT-6974] updated to the latest from 'master'; updated upgrade patch; resolved conflicts in:
- create/src/data.tmpl
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_6050.c
- ui/include/defines.inc.php