[27.x backport] test-fixes#5720

thaJeztah merged 2 commits into

docker:27.xdocker/cli:27.xfrom

thaJeztah:27.x_backport_fix-container-cp-testthaJeztah/cli:27.x_backport_fix-container-cp-testCopy head branch name to clipboard