Merge release-2021 into release-2022

Only the 2021.7 release date is updated and the merge conflict in cmake/gmxVersionInfo.cmake is resolved.

But let's still merge it to keep things in sync.