Merge branch 'sh-fix-container-registry-destroy' into 'master'
Fix deletion of container registry or images returning an error
Closes #39354
See merge request gitlab-org/gitlab-ce!14992
(cherry picked from commit 4cc91b4f)
3e81c500 Fix deletion of container registry or images returning an error