Merge branch 'master' into OZG-4561-alfa-renames

# Conflicts:
#	alfa-client/apps/alfa-e2e/Jenkinsfile
#	alfa-client/apps/alfa-e2e/Jenkinsfile-static
#	alfa-client/apps/alfa-e2e/src/fixtures/argocd/by-main-dev.yaml
#	alfa-client/pom.xml