Merge "Skip some tests when cinder is not enabled"