Refactor container cleanup to use latest functions#2995

openshift-merge-robot merged 1 commit intocontainers:mastercontainers/podman:masterfrom

jwhonce:wip/cleanupjwhonce/podman:wip/cleanupCopy head branch name to clipboard