Signed-off-by: John Howard <jhoward@microsoft.com> (cherry picked from commit fd4f5c23650799a7e76e193614bf82454b375fe3) Signed-off-by: Tibor Vass <tibor@docker.com>