Updates for ceilometer integration
[james-page] Updates for ceilometer integration