fix for #1674 - Handlebars template variable name

Contains a fix for Handlebars compiler creating invalid variable name when filenames containe "-".

Bug report: #1674