[backport-1.3]: Investigate get-openstack-images creating duplicate images

Issue #1962 (closed) needs to be backported to 1.3.x