Merge "cinder: move glance params into base"