[QA] Make terminal Dependent tests more robust
[QA] Fix import ordering
Fix XDG_DATA_HOME default location
Support custom core.commentchar in default templates

I had obviously wrong assumed people with custom commentchar settings would also
have custom templates.  Thanks Saddiq for proving me wrong ;)