Merge "vpnaas: Wait for site connection status" into mcp/caracal