BACKLOG-4456 simplify template base
Merge pull request #1 from jkevan/master

BACKLOG-4456 simplify template base