Signed-off-by: Stefan Scherer <stefan.scherer@docker.com> (cherry picked from commit aad7e9797b2e9a980b28d7d77bc119cb4b7e57dc) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 04d0295c0cdfe3e67ab51ca611e3a7dd8a49b668 Component: engine