Zabbix

.......... [ZBXNEXT-3196] updated to the latest trunk; fixed conflicts in:

 - src/libs/zbxdbupgrade/dbupgrade_3010.c
 - frontends/php/include/defines.inc.php
 - src/zabbix_server/timer/timer.c
 - create/src/schema.tmpl