Allow override of default endpoint type in ceilometer.conf

Conflicts:
	templates/default/ceilometer.conf.erb