Zabbix

.......... [ZBXNEXT-8760] updated to latest master; fixed conflicts in:
- src/libs/zbxdbupgrade/dbupgrade_6050.c
- create/src/schema.tmpl
- ui/include/defines.inc.php
- ui/include/classes/api/services/CUser.php
- ui/tests/api_json/testUsers.php