Merge "Cross-domain topology discovery for ACTN, bug fixing."