merge in ceilometer stuff from Ron

Issue TA169