and fix some tests Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 93615dd967 Component: cli
93615dd967