Merge "Feature 5649: allow alternative images for specific VIMs in VNFD"