Merge "Set correct identity protocol for ceilometer agent"