Cherry-picked ceilometer changes for V4.2.1rc