Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067 Component: engine
Signed-off-by: David Calavera <david.calavera@gmail.com> Upstream-commit: 22a81a2c588a7505fd5f900e2093c44cd51ae142 Component: engine