Zabbix

.......... [ZBXNEXT-8087] updated to latest from master; resolved conflicts in:
- create/src/schema.tmpl
- src/libs/zbxdbupgrade/dbupgrade_6030.c
- ui/include/classes/api/services/CTemplate.php
- ui/include/classes/import/CImportDataAdapter.php
- ui/include/classes/import/importers/CTemplateImporter.php
- ui/include/classes/import/validators/C64XmlValidator.php
- ui/include/defines.inc.php
- ui/include/views/configuration.host.discovery.list.php
- ui/include/views/configuration.host.prototype.edit.php
- ui/include/views/configuration.host.prototype.list.php
- ui/include/views/configuration.httpconf.list.php
- ui/include/views/configuration.template.edit.php
- ui/include/views/configuration.template.list.php
- ui/templates.php
- ui/tests/api_json/testTemplate.php
- ui/tests/selenium/templates/testPageTemplates.php
- ui/tests/unit/include/classes/import/CImportDataAdapterTest.php