Merge "Add NFVO external-system in AAI"