Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 83a4afe2645d2e39cf6b10a86e9e681a7ff06eb2 Component: engine