Cherry-pick from django-openstack-auth accidentally closed this bug. We still need a fix on horizon side (non openstack_auth).
Cherry-pick from django- openstack- auth accidentally closed this bug. We still need a fix on horizon side (non openstack_auth).