if it's only an issue because of jingo, you could also exclude those templates from jingo, and have them automatically rendered using Django's template engine (check the ```JINGO_EXCLUDE_APPS``` and ```JINGO_EXCLUDE_PATHS```).

Also, please note https://bugzilla.mozilla.org/show_bug.cgi?id=976727 that reverted the jingo update (I'll be working on fixing that next week).