Zabbix

.......... [DEV-2299] updated to latest master; resolved conflicts in:

#	sass/stylesheets/sass/components/dashboard/_widget-svggraph.scss
#	ui/app/views/administration.script.edit.php
#	ui/app/views/configuration.dashboard.edit.php
#	ui/app/views/configuration.discovery.edit.php
#	ui/app/views/js/configuration.discovery.edit.js.php
#	ui/app/views/js/monitoring.host.dashboard.view.js.php
#	ui/app/views/monitoring.dashboard.view.php
#	ui/app/views/popup.token.view.php
#	ui/assets/styles/blue-theme.css
#	ui/assets/styles/dark-theme.css
#	ui/assets/styles/hc-dark.css
#	ui/assets/styles/hc-light.css
#	ui/include/actions.inc.php
#	ui/include/classes/html/CButtonExport.php
#	ui/include/classes/html/widgets/fields/CWidgetFieldColumnsListView.php
#	ui/include/classes/html/widgets/fields/CWidgetFieldGraphDataSetView.php
#	ui/include/classes/html/widgets/fields/CWidgetFieldGraphOverrideView.php
#	ui/include/html.inc.php
#	ui/tests/include/web/elements/CMessageElement.php
#	ui/tests/include/web/elements/CWidgetElement.php
#	ui/tests/selenium/testDocumentationLinks.php