Comment 7 for bug 1756142

Dan's branch seems to definitively resolve the issue with template folders for me.

I have not been able to thoroughly test it with output folders, yet, because my normal account is apparently assigned to a library that doesn't use reports. I will have to find an account to see if I can reproduce Blake's previous comment.