Merge "358 - Handling Vnf delete conflicts from RO"