Ha backports

This is a backport of https://github.com/crowbar/barclamp-ceilometer/pull/144

It combines the https://github.com/crowbar/barclamp-ceilometer/pull/103, https://github.com/crowbar/barclamp-ceilometer/pull/119 and the missing patches from #144.