Zabbix

.......... [ZBXNEXT-2683] updated to the latest trunk; resolved conflicts in:

 - src/libs/zbxcommon/str.c
 - src/libs/zbxserver/expression.c
 - include/common.h
 - create/src/schema.tmpl
 - src/libs/zbxdbupgrade/dbupgrade_2050.c