BC-4375 - merge main and fix conflict #14183

Job	Run time
branch_meta	1s
build_and_push	4m 3s
trivy-vulnerability-scanning	1m 19s
deploy / create_artifacts_repos (schulcloud-server)	3m 9s
deploy / create_artifacts_repos (schulcloud-client)	18s
end-to-end-tests / e2e (courses_and_topics)	5m 44s
deploy / create_artifacts_repos (nuxt-client)	19s
deploy / create_artifacts_repos (superhero-dashboard)	5s
end-to-end-tests / e2e (management)	7m 29s
deploy / create_artifacts_repos (schulcloud-calendar)	5s
end-to-end-tests / e2e (navi_user_settings)	7m 21s
deploy / create_artifacts_repos (antivirus_check_service)	8s
end-to-end-tests / e2e (tasks_and_other)	6m 56s
deploy / create_artifacts_repos (version-aggregator)	5s
deploy / create_artifacts_repos (dof_app_deploy)	7s
deploy / create_artifacts_repos (h5p-staticfiles-server)	4s
deploy / create_branch_identifier / convert_branch_name	1s
deploy / create_artifacts_workspaces (brb)	10s
deploy / create_artifacts_workspaces (default)	2s
deploy / create_artifacts_workspaces (nbc)	5s
deploy / bingo_add_branch / get_values_insert_branch_if_not_existent	4s
deploy / deploy	7m 57s
test-successful	3s
deploy-successful	3s
cy-e2e-tests / e2e-system-tests	12s
cy-e2e-tests / configuring-loading-secrets-running-tests / configure-load-secrets-and-run_tests	11s
	46m 1s

Provide feedback