Zabbix

.......... [ZBXNEXT-5702] updated to latest from ^master; Conflicts resolved

 Conflicts:
	create/src/schema.tmpl
	frontends/php/app/controllers/CControllerProfileUpdate.php
	frontends/php/hostinventories.php
	frontends/php/include/classes/pagefilter/CPageFilter.php
	frontends/php/include/defines.inc.php
	frontends/php/include/menu.inc.php
	src/libs/zbxdbupgrade/dbupgrade_4050.c

 Conflicts in context:
    frontends/php/include/menu.inc.php
    frontends/php/app/partials/monitoring.host.view.html.php