Merge branch 'ceilometer_devstack' of https://github.com/open-cloud/xos into ceilometer_devstack