Merge "Fix Ceilometer service host"