Merge "Enable ceilometer compute agent" into stable/pike