Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 4f0d95fa6ee7f865597c03b9e63702cdcb0f7067 Component: engine
Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 6121a8429b9d3a6d20e900c521c2f50fff5db406 Component: engine