Fix up ceilometer havana templates

Change-Id: Iac30c7c49f2487897d00925647fe7bc59ca90fb2