Zabbix

.......... [ZBXNEXT-8331] updated to latest master; resolved conflicts in database upgrade files, defines and tab-indicators JS class

# Conflicts:
#	create/src/schema.tmpl
#	src/libs/zbxdbupgrade/dbupgrade_6050.c
#	ui/include/defines.inc.php
#	ui/js/class.tab-indicators.js