Merge "ceilometer-collector now has errors"