add ceilometer stuff from Ron
Merge pull request #270 from mancdaz/grizzly

Merged automatically by jenkins after successful build test