[1.6.x] Fixed backport error in previous commit; refs #15961
[1.6.x] Fixed backport error in previous commit; refs #15961

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