Merge "Ceilometer take into account cluster_internal_protocol variable"