Merge "Skip EC2VolumesTest if Cinder is not available"