Merge "[vpnaas] Change CIRD for test subnets" into mcp/caracal