cherry-picked template change from c471cda
add storename to make unit_test
Merge remote-tracking branch 'ChrBrAtePages/master' into
feature/newStuff

Conflicts:
	perl_templates.xml