oci: simplify stopping code#7129

openshift-merge-robot merged 4 commits intocri-o:maincri-o/cri-o:mainfrom

haircommander:stop-refactorhaircommander/cri-o:stop-refactorCopy head branch name to clipboard