Merge "Fix Ceilometer tests config options"
tree: 35f84e4f5aa4f13512081c4898dcacebaaf058d0
  1. ceilometer/