Merge "Update SO-VNFM-Adapter override.yaml for ETSI"