Zabbix

..F.I..... [ZBXNEXT-221] updated to latest from ^/trunk
;conflicts resolved in:
- frontends/php/tests/api_json/data/data_test.sql
- src/libs/zbxdbupgrade/dbupgrade_4010.c
;needed adjustments made in:
- create/src/schema.tmpl
- frontends/php/include/defines.inc.php
- frontends/php/tests/api_json/ApiJsonTests.php