Incorrect merging of lists in template files

Change-Id: I884104f92304ea1fb9a538469f3c011ac15834e6