Update for some moved items in django.template
Review Request #8693 — Created Jan. 31, 2017 and submitted — Latest diff uploaded
Django moved the locations of some classes and methods within the
django.templatemodule. This change updates our code for the new location.
Ran unit tests.