Merge "AAI-1459 Update service-instance schema for CCVPN"