Fixissue942

Rolled the ceilometer Fix and Cinder Fix in one PR.

These are role changes.