Merge "Glance should not reference Cinder v1"