Merge "fix topology discovery bug for ccvpn" into casablanca