Merge "cinder v2 api tests - part1"