[1.6.x] Removed unneeded conditional_escapes from the testsuite.
[1.6.x] Removed unneeded conditional_escapes from the testsuite.

Backport of 4e50e4065489f06d72eed8ce2d9ae98639be5a93 from master.

felixjimenez/django,felixjimenez/django,django-nonrel/django,dex4er/django,felixjimenez/django,redhat-openstack/django,redhat-openstack/django,django-nonrel/django,django-nonrel/django,redhat-openstack/django,dex4er/django,django-nonrel/django,dex4er/django,redhat-openstack/django,felixjimenez/django