pkubatrh and pvalena Move to test-lib s2i functions to provide podman compatibility