Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com> Signed-off-by: Tibor Vass <tibor@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit83aeb219f0) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit:3af1848ddaComponent: cli