Merge "Enable Cinder as a backend for Glance" into stable/pike