Fix to respect 'template_dir' for non Jinja2 templates (#852)

* fix applied
* entry to changelog added