Zabbix

.......... [ZBXNEXT-1675] updated to the latest trunk; resolved conflicts in:
 - create/src/data.tmpl
 - create/src/schema.tmpl
 - frontends/php/include/defines.inc.php
 - frontends/php/tests/api_json/testScripts.php
 - src/libs/zbxdbupgrade/dbupgrade_3030.c