Zabbix

.......... [ZBXNEXT-2020,ZBXNEXT-8918] updated to latest from master; resolved conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_6050.c
- ui/include/defines.inc.php
- ui/tests/unit/include/classes/import/converters/C64ImportConverterTest.php