Do not prepend subfolder prefix for bundled templates
Merge pull request #2314 from opf/fix/template_handling_in_subfolders

Do not prepend subfolder prefix for bundled templates