Merge branch 'nkupdates-edge' into 'edge'

Dockerfile

etc/supervisor/conf.d/zabbix-agent.conf.disabled

etc/supervisor/conf.d/zabbix-agent2.conf.disabled

etc/supervisor/conf.d/zabbix-proxy.conf.tmpl

etc/supervisor/conf.d/zabbix-server.conf.tmpl

etc/supervisor/conf.d/zabbix-web-service.conf.disabled

tests/docker-compose.yml.mysql.tmpl

tests/docker-compose.yml.postgresql.tmpl

tests/docker-compose.yml.timescaledb.tmpl

tests/run-cluster-test

...ocal/share/flexible-docker-containers/init.d/48-zabbix.sh

.../flexible-docker-containers/pre-exec-tests.d/48-zabbix.sh

.../flexible-docker-containers/pre-init-tests.d/48-zabbix.sh

.../flexible-docker-containers/tests.d/48-zabbix-frontend.sh