Zabbix

.......... [ZBXNEXT-7048] updated to latest master

Conflicts:
	create/src/schema.tmpl
	include/zbxcacheconfig.h
	include/zbxdbschema.h
	src/libs/zbxcacheconfig/dbconfig.c
	src/libs/zbxcacheconfig/dbsync.c
	src/libs/zbxdbupgrade/dbupgrade_7030.c
	src/zabbix_server/proxyconfigread/proxyconfigread.c
	ui/app/controllers/CControllerMiscConfigEdit.php
	ui/app/controllers/CControllerMiscConfigUpdate.php
	ui/app/views/administration.miscconfig.edit.php
	ui/include/classes/api/services/CSettings.php
	ui/include/classes/helpers/CSettingsHelper.php
	ui/include/defines.inc.php
	ui/include/schema.inc.php