Zabbix

.......... [ZBXNEXT-1675] updated to the latest trunk; resolved conflicts in:
 - create/src/schema.tmpl
 - frontends/php/include/defines.inc.php
 - frontends/php/include/profiles.inc.php
 - frontends/php/include/schema.inc.php
 - frontends/php/tests/selenium/testFormAdministrationGeneralHousekeeper.php
 - src/libs/zbxdbcache/dbconfig.c
 - src/libs/zbxdbupgrade/dbupgrade_3030.c
 - src/zabbix_server/escalator/escalator.c
 - src/zabbix_server/housekeeper/housekeeper.c
 - src/zabbix_server/httppoller/httptest.c