More ceilometer work
Merged in abustardo/mcloud-conf (pull request #620)

More ceilometer work
Merge branch 'master' of bitbucket.org:wdamarillo/mcloud-conf