Merge "[DCAEGEN2-SERVICES] Fix and resolve remote references in st. def. domain"