Zabbix

..F....... [ZBXNEXT-5702] updated to latest from master; resolved conflicts in:
	create/src/schema.tmpl
	frontends/php/app/controllers/CControllerProfileUpdate.php
	frontends/php/app/views/monitoring.web.view.php
	frontends/php/app/views/monitoring.widget.trigover.view.php
	frontends/php/include/classes/pagefilter/CPageFilter.php
	frontends/php/include/classes/screens/CScreenTriggersOverview.php
	frontends/php/include/defines.inc.php
	frontends/php/include/menu.inc.php
	frontends/php/include/triggers.inc.php
	frontends/php/include/views/monitoring.charts.php
	frontends/php/include/views/monitoring.overview.items.php
	frontends/php/include/views/monitoring.overview.triggers.php
	frontends/php/tests/include/CLegacyWebTest.php
	src/libs/zbxdbupgrade/dbupgrade_4050.c