Merge "Fix AAF Locator for ONAP"