Zabbix

.......... [ZBXNEXT-2976] updated to latest from master; Resolved conflicts in:
	create/src/schema.tmpl
	create/src/templates.tmpl
	include/zbxjson.h
	src/libs/zbxdbupgrade/dbupgrade_5030.c
	templates/app/elasticsearch_http/template_app_elasticsearch_http.yaml
	templates/app/haproxy_agent/template_app_haproxy_agent.yaml
	templates/app/haproxy_http/template_app_haproxy_http.yaml
	templates/app/jenkins/template_app_jenkins.yaml
	templates/app/rabbitmq_agent/template_app_rabbitmq_agent.yaml
	templates/app/rabbitmq_http/template_app_rabbitmq_http.yaml
	templates/db/mssql_odbc/template_db_mssql_odbc.yaml
	templates/db/postgresql/template_db_postgresql.yaml
	templates/db/postgresql_agent2/template_db_postgresql_agent2.yaml
	templates/module/host_resources_snmp/template_module_host_resources_snmp.yaml
	templates/module/interfaces_simple_snmp/template_module_interfaces_simple_snmp.yaml
	templates/module/interfaces_snmp/template_module_interfaces_snmp.yaml
	templates/module/interfaces_win_snmp/template_module_interfaces_win_snmp.yaml
	templates/net/mellanox_snmp/template_net_mellanox_snmp.yaml
	templates/os/linux/template_os_linux.yaml
	templates/os/linux_active/template_os_linux_active.yaml
	templates/os/linux_prom/template_os_linux_prom.yaml
	templates/os/windows_agent/template_os_windows_agent.yaml
	templates/os/windows_agent_active/template_os_windows_agent_active.yaml
	templates/tel/asterisk_http/template_tel_asterisk_http.yaml
	ui/app/controllers/CControllerProfileUpdate.php
	ui/app/views/js/reports.auditlog.list.js.php
	ui/app/views/monitoring.dashboard.view.php
	ui/include/classes/api/managers/CItemPrototypeManager.php
	ui/include/classes/api/services/CHost.php
	ui/include/classes/api/services/CHostGeneral.php
	ui/include/classes/export/CConfigurationExportBuilder.php
	ui/include/classes/import/converters/C52ImportConverter.php
	ui/include/classes/screens/CScreenBase.php
	ui/include/classes/screens/CScreenDataOverview.php
	ui/include/classes/screens/CScreenTriggersOverview.php
	ui/include/defines.inc.php
	ui/include/views/monitoring.screen.constructor.edit.php
	ui/js/init.js
	ui/screenedit.php
	ui/tests/api_json/testAuditLog.php
	ui/tests/api_json/xml/testDeleteMissingForLinkedTemplateApplication.xml