Fixes to templates to support crowddetector plugin

Change-Id: I2989eb59dc8f69076641baafc50fdecec4dc7e08