Merge "load_images: update flavor for _ovs_ scenarios"