Signed-off-by: Victor Vieux <vieux@docker.com> (cherry picked from commit 0e5346df3276bab0f282e62f52f5c5b7732f97a3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 650b381991ed2816fc66ebec96505c758e444739 Component: engine