Zabbix

.......... [ZBXNEXT-413,ZBXNEXT-4572] merged from latest ^/trunk; resolved conflicts in:
 - create/src/schema.tmpl
 - frontends/php/maintenance.php
 - frontends/php/app/views/monitoring.widget.problems.view.php
 - frontends/php/include/classes/screens/CScreenProblem.php
 - frontends/php/include/classes/widgets/forms/CWidgetFormProblemHosts.php
 - frontends/php/include/classes/widgets/forms/CWidgetFormProblems.php
 - frontends/php/include/classes/widgets/forms/CWidgetFormProblemsBySv.php
 - frontends/php/include/classes/widgets/views/widget.problemhosts.form.view.php
 - frontends/php/include/classes/widgets/views/widget.problemsbysv.form.view.php
 - frontends/php/include/classes/widgets/views/widget.problems.form.view.php
 - frontends/php/include/defines.inc.php
 - src/libs/zbxdbupgrade/dbupgrade_3050.c