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

alfa-client/apps/alfa-e2e/Jenkinsfile-static

@@ -150,7 +150,7 @@ pipeline {
                     FAILED_STAGE = env.STAGE_NAME
 
                     sh 'npm --version'
-                    dir('alfa') {
+                    dir('goofy-client') {
                         sh 'echo "registry=https://nexus.ozg-sh.de/repository/npm-proxy" >> ~/.npmrc'
                         sh 'echo "//nexus.ozg-sh.de/:_auth=amVua2luczprTSFnNVUhMVQzNDZxWQ==" >> ~/.npmrc'
 

alfa-client/apps/alfa-e2e/src/e2e/main-tests/vorgang-detailansicht/vorgang-wiedervorlage-loading.cy.ts

@@ -89,7 +89,7 @@ describe('Vorgang wiedervorlage loading', () => {
 		})
 	})
 
-	describe('Vorgang without wiedervorlagen', () => {
+	describe.skip('Vorgang without wiedervorlagen', () => {
 
 		it('should show vorgang detail by click on vorgang in list', () => {
 			vorgangList.getListItem(vorgangWithOtherWiedervorlagen.name).getRoot().click();