Merge branch 'onemoz-master-patch-6628' into 'master'

Adding two more troubleshooting cases

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



Merged-by: Jon Glassman <jglassman@gitlab.com>
Co-authored-by: olivier némoz saint-dizier <onemoz@gitlab.com>