oci: fix issues with exec#4999

openshift-merge-robot merged 2 commits intocri-o:mastercri-o/cri-o:masterfrom

haircommander:exec-pid-filehaircommander/cri-o:exec-pid-fileCopy head branch name to clipboard