Merge remote-tracking branch 'origin/edge' into nkupdates

Dockerfile

contrib/docker-compose.yml

docker_release_version.sh

etc/nginx/http.d/50_vhost_default.conf.template

etc/nginx/http.d/55_vhost_default-ssl-certbot.conf.template

tests/docker-compose.yml.mysql.tmpl

tests/docker-compose.yml.postgresql.tmpl

tests/docker-compose.yml.timescaledb.tmpl

tests/run-cluster-test

...exible-docker-containers/healthcheck.d/48-zabbix-agent.sh

...xible-docker-containers/healthcheck.d/48-zabbix-agent2.sh

...exible-docker-containers/healthcheck.d/48-zabbix-proxy.sh

...xible-docker-containers/healthcheck.d/48-zabbix-server.sh

...e-docker-containers/healthcheck.d/48-zabbix-webservice.sh

...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

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

...are/flexible-docker-containers/tests.d/48-zabbix-agent.sh

...re/flexible-docker-containers/tests.d/48-zabbix-agent2.sh