update system
Merge branch 'devel' of https://github.com/jyericlin/ceilometer into devel