Zabbix

.......... [ZBXNEXT-8593] synced with upstream, resolved conflicts

There were conflicts in the following files:

* create/src/schema.tmpl
* include/zbxcommon.h
* include/zbxscripts.h
* src/libs/zbxdbupgrade/dbupgrade_6050.c
* src/zabbix_server/trapper/nodecommand.c
* ui/include/defines.inc.php

create/src/schema.tmpl, src/libs/zbxdbupgrade/dbupgrade_6050.c and
ui/include/defines.inc.php conflicted due to other patches having been
added in upstream.

include/zbxcommon.h and include/zbxscripts.h conflicted due to the
zbx_script_t type and related value macro definitions being moved out of
include/zbxcommon.h.

src/zabbix_server/trapper/nodecommand.c conflicted due to the signature
of execute_script() having changed.