[1.22] Backport crio storage wipe#6420

wgahnagl wants to merge 2 commits intocri-o:release-1.22cri-o/cri-o:release-1.22from

wgahnagl:backport-crio-storage-wipewgahnagl/cri-o:backport-crio-storage-wipeCopy head branch name to clipboard