Fix issue with duplicate fields not being added to multiple templates
in overwrite and replace import modes.