Multiple fixes applied when branching v2022dev3

These errors were encountered during the release branching and fixed on the spot. They are mostly about stuff which changed since the last release (like repository structure, repository paths, layouts) and some stuff which were made obsolete