Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> (cherry picked from commit 723b107ca4fba14580a6cd971e63d8af2e7d2bbe) Signed-off-by: Andrew Hsu <andrewhsu@docker.com> (cherry picked from commit a588898f99d697e5ff481ecb3b273f45410f10e6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 37ec11c8e3a6d1405680b7a309e72087904bcbd4 Component: engine