Merge "Enable cinder v2 api tests in volume quotas"