Zabbix

..F....... [ZBXNEXT-8956] updated to latest master; conflicts solved:
	create/src/schema.tmpl
	src/libs/zbxdbupgrade/dbupgrade_6050.c
	ui/include/defines.inc.php
	ui/widgets/hostnavigator/assets/js/class.hostnavigator.js
	ui/widgets/hostnavigator/assets/js/class.widget.js