Zabbix

.......... [ZBXNEXT-4185] updated to the latest trunk; fixed conflicts in:

 - create/src/schema.tmpl
 - frontends/php/app/controllers/CControllerDashbrdWidgetConfig.php
 - frontends/php/app/views/monitoring.dashboard.config.php
 - frontends/php/include/classes/widgets/CClockWidgetForm.php
 - frontends/php/include/classes/widgets/CGraphWidgetForm.php
 - frontends/php/include/classes/widgets/CPlainTextWidgetForm.php
 - frontends/php/include/defines.inc.php
 - frontends/php/include/views/configuration.item.prototype.edit.php
 - frontends/php/include/views/monitoring.history.php
 - frontends/php/include/views/monitoring.screen.constructor.edit.php
 - src/libs/zbxdbupgrade/dbupgrade_3050.c