Test fixes needed for upgrading ci runners and engine#4867

krissetto merged 1 commit intodocker:masterdocker/cli:masterfrom

krissetto:test-fixeskrissetto/docker-cli:test-fixesCopy head branch name to clipboard