Merge "Adding support for multi-layer and multi-domain topology discovery for CCVPN"