Signed-off-by: Santhosh Manohar <santhosh@docker.com> (cherry picked from commit 2153d9ec9d32b882be929a79997c326d516fc44a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 17bce424d6e4356d0102dad55b9a0f7f03a64528 Component: engine