Merge branch 'sherlock/icehouse' of https://github.com/mizeng/ceilometer into sherlock/icehouse
Merge branch 'sherlock/icehouse' of https://github.com/mizeng/ceilometer into sherlock/icehouse