Zabbix

.......... [DEV-2325] updated to latest master

Conflicts:
	include/zbxscripts.h
	src/libs/zbxscripts/scripts.c
	src/zabbix_proxy/taskmanager/taskmanager_proxy.c
	src/zabbix_server/escalator/escalator.c
	src/zabbix_server/trapper/nodecommand.c
	src/zabbix_server/trapper/nodecommand.h
	src/zabbix_server/trapper/trapper.c
	tests/libs/zbxeval/Makefile.am
	tests/libs/zbxexpression/Makefile.am
	tests/libs/zbxsysinfo/Makefile.am