Havana-related fixes

This comes from https://github.com/crowbar/barclamp-ceilometer/pull/39