Merge "AAI-1460 Update logical-link schema for CCVPN"