Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 6345208b9b067f19f7792edcc675f59a617a3ca5) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 9a4d7bb0e25169fa7d48e24777c683587c29c25a Component: engine
Signed-off-by: Vincent Demeester <vincent@sbr.pm> Upstream-commit: 38457285242e57306c5b7ee652c7ccbb9fbd6713 Component: engine
Signed-off-by: John Stephens <johnstep@docker.com> Upstream-commit: 72192f5052667118c2f83282f8f8c3df8cbf514b Component: engine