[19.03 backport] test-fixes and improvements#267

andrewhsu merged 3 commits into

docker-archive:19.03docker-archive/engine:19.03from

thaJeztah:19.03_backport_test_fixesthaJeztah/docker:19.03_backport_test_fixesCopy head branch name to clipboard