Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 32d70c7e21631224674cd60021d3ec908c2d888c) Signed-off-by: Tibor Vass <tibor@docker.com> (cherry picked from commit ebb542b3f88d7f5551f6b6e1d8d2774a2c166409) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 1371b11749854515289abe6bcc0c1b0759ea7a5b Component: engine