Zabbix

.......... [ZBXNEXT-1274] updated to the latest trunk; fixed conflicts in:
 - create/src/data.tmpl
 - create/src/schema.tmpl
 - frontends/php/disc_prototypes.php
 - frontends/php/include/classes/export/CConfigurationExport.php
 - frontends/php/include/classes/import/converters/C32ImportConverter.php
 - frontends/php/include/defines.inc.php
 - frontends/php/include/items.inc.php
 - frontends/php/items.php
 - frontends/php/tests/unit/include/classes/import/converters/C32ImportConverterTest.php
 - src/libs/zbxdbupgrade/dbupgrade_3030.c