Merge "Fix client usage in multibackend volume test"