Merge remote-tracking branch 'security/12-6-stable' into 12-6-stable

This merge is needed because of a race between FOSS merge on canonical
and security.

Details on https://gitlab.com/gitlab-org/release-tools/issues/358