Merge branch 'axil-15-changes' into 'master'

Clean up and consolidate GitLab 15 changes

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130060



Merged-by: Kati Paizee <kpaizee@gitlab.com>
Approved-by: Kati Paizee <kpaizee@gitlab.com>
Reviewed-by: Achilleas Pipinellis <axil@gitlab.com>
Reviewed-by: Kati Paizee <kpaizee@gitlab.com>
Co-authored-by: Achilleas Pipinellis <axil@gitlab.com>