Merge "Reuse v2 extension client for cinder v3"