Merge "Use Cinder API V2 if V1 is disabled"