[backport-1.6]: os-image-info takes too long to run (regression)

A solution for issue #3331 (closed) needs to be backported to 1.6.x