[1.6.x] Completed some more name_local names
[1.6.x] Completed some more name_local names

Backport of 9383e37a7.

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