Zabbix

A.F....PS. [ZBXNEXT-2592] updated to latest from master; resolved conflicts in:
- create/src/schema.tmpl,
- src/libs/zbxdbupgrade/dbupgrade_6010.c,
- ui/app/controllers/CControllerUsergroupCreate.php,
- ui/app/controllers/CControllerUsergroupUpdate.php,
- ui/app/views/js/administration.usergroup.edit.js.php,
- ui/include/classes/api/CAudit.php,
- ui/include/classes/api/services/CUserGroup.php,
- ui/include/defines.inc.php,
- ui/tests/api_json/data/data_test.sql