Merge "Cinder tests - Volume Availability Zone"