solved more conflicts caused by revert #15671

Job	Run time
branch_meta	1s
build_and_push	3m 25s
trivy-vulnerability-scanning	40s
deploy / create_artifacts_repos (schulcloud-server)	56s
deploy / create_artifacts_repos (schulcloud-client)	12s
deploy / create_artifacts_repos (nuxt-client)	15s
end-to-end-tests / e2e (courses_and_topics)	4m 30s
deploy / create_artifacts_repos (superhero-dashboard)	7s
end-to-end-tests / e2e (management)	7m 17s
deploy / create_artifacts_repos (schulcloud-calendar)	4s
end-to-end-tests / e2e (navi_user_settings)	5m 41s
deploy / create_artifacts_repos (antivirus_check_service)	8s
end-to-end-tests / e2e (tasks_and_other)	5m 45s
deploy / create_artifacts_repos (version-aggregator)	5s
deploy / create_artifacts_repos (dof_app_deploy)	6s
deploy / create_artifacts_repos (h5p-staticfiles-server)	5s
deploy / create_branch_identifier / convert_branch_name	1s
deploy / create_artifacts_workspaces (brb)	3s
deploy / create_artifacts_workspaces (default)	5s
deploy / create_artifacts_workspaces (nbc)	4s
deploy / create_artifacts_workspaces (thr)	3s
deploy / bingo_add_branch / get_values_insert_branch_if_not_existent	3s
deploy / deploy_brb_dev / deploy brb	6m 25s
deploy / deploy_dbc_dev / deploy dbc	6m 18s
deploy / deploy_nbc_dev / deploy nbc	7m 1s
test-successful	3s
deploy-successful	1s
cy-e2e-tests / e2e-system-tests	5m 22s
cy-e2e-tests / configuring-loading-secrets-running-tests	0s
	54m 46s

Provide feedback