hacked fix to correct the ceilometer endpoint bug
Merge remote-tracking branch 'origin/devel'