.......... [ZBX-6190] updated to the latest trunk

resolved conflicts:
 - src/libs/zbxserver/expression.c
 - include/zbxserver.h
 - src/zabbix_server/poller/checks_calculated.c
 - src/libs/zbxserver/evalfunc.c