Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067 Component: engine
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Upstream-commit: ec7b6238c31e26702ecf366731532e189b5da142 Component: engine