Merge "cinder v2 api tests - fix volume client"