Merge "Volume Service Testing: default to v3 endpoints"