Temp fix for api/keystone.py
Temp fix for api/keystone.py

as the needed change is not merged yet in keystone...

This is the related change:
   https://review.openstack.org/#/c/9582

As I see there are some arguments around this change.
So either this or the related change should be merged...

Change-Id: I4a18ccf0aa190dc5632ec28b398784b04cf448be

rickerc/horizon_audit,BiznetGIO/horizon,netscaler/horizon,endorphinl/horizon,coreycb/horizon,openstack/horizon,citrix-openstack-build/horizon,froyobin/horizon,Daniex/horizon,tqtran7/horizon,tsufiev/horizon,Daniex/horizon,ChameleonCloud/horizon,karthik-suresh/horizon,mrunge/openstack_horizon,bac/horizon,r-icarus/openstack_microserver,flochaz/horizon,blueboxgroup/horizon,yjxtogo/horizon,django-leonardo/horizon,BiznetGIO/horizon,opencloudconsortium/tukey-portal,dan1/horizon-x509,vladryk/horizon,yeming233/horizon,noironetworks/horizon,dan1/horizon-proto,karthik-suresh/horizon,coreycb/horizon,liyitest/rr,mandeepdhami/horizon,RudoCris/horizon,sandvine/horizon,icloudrnd/automation_tools,kaiweifan/horizon,agileblaze/OpenStackTwoFactorAuthentication,vbannai/disk-qos-horizon,tellesnobrega/horizon,Mirantis/mos-horizon,saydulk/horizon,saydulk/horizon,dan1/horizon-x509,Tesora/tesora-horizon,zouyapeng/horizon,anthonydillon/horizon,redhat-openstack/horizon,liyitest/rr,gochist/horizon,flochaz/horizon,CiscoSystems/avos,tanglei528/horizon,CiscoSystems/avos,BiznetGIO/horizon,newrocknj/horizon,icloudrnd/automation_tools,sandvine/horizon,pranavtendolkr/horizon,99cloud/keystone_register,doug-fish/horizon,yjxtogo/horizon,django-leonardo/horizon,ikargis/horizon_fod,bigswitch/horizon,xinwu/horizon,davidcusatis/horizon,nvoron23/avos,NeCTAR-RC/horizon,NCI-Cloud/horizon,kaiweifan/horizon,redhat-cip/horizon,zouyapeng/horizon,Tesora/tesora-horizon,NeCTAR-RC/horizon,Solinea/horizon,maestro-hybrid-cloud/horizon,philoniare/horizon,openstack-ja/horizon,dan1/horizon-proto,anthonydillon/horizon,CiscoSystems/avos,kfox1111/horizon,CiscoSystems/horizon,idjaw/horizon,rickerc/horizon_audit,ging/horizon,ging/horizon,netscaler/horizon,bac/horizon,maestro-hybrid-cloud/horizon,wangxiangyu/horizon,tqtran7/horizon,Solinea/horizon,pranavtendolkr/horizon,j4/horizon,mdavid/horizon,Daniex/horizon,tanglei528/horizon,kfox1111/horizon,VaneCloud/horizon,watonyweng/horizon,nvoron23/avos,newrocknj/horizon,pranavtendolkr/horizon,FNST-OpenStack/horizon,openstack/horizon,froyobin/horizon,liyitest/rr,mrunge/horizon,takeshineshiro/horizon,orbitfp7/horizon,flochaz/horizon,eayunstack/horizon,noironetworks/horizon,froyobin/horizon,tuskar/tuskar-ui,henaras/horizon,endorphinl/horizon,j4/horizon,Daniex/horizon,opencloudconsortium/tukey-portal,FNST-OpenStack/horizon,anthonydillon/horizon,xme1226/horizon,yeming233/horizon,endorphinl/horizon-fork,gerrive/horizon,Dark-Hacker/horizon,LabAdvComp/tukey_portal,noironetworks/horizon,icloudrnd/automation_tools,NeCTAR-RC/horizon,99cloud/keystone_register,wangxiangyu/horizon,JioCloud/horizon,karthik-suresh/horizon,Mirantis/mos-horizon,philoniare/horizon,damien-dg/horizon,mandeepdhami/horizon,pranavtendolkr/horizon,mdavid/horizon,endorphinl/horizon,netscaler/horizon,citrix-openstack-build/horizon,davidcusatis/horizon,coreycb/horizon,rdo-management/tuskar-ui,tellesnobrega/horizon,redhat-cip/horizon,openstack/horizon,nvoron23/avos,watonyweng/horizon,maestro-hybrid-cloud/horizon,BiznetGIO/horizon,aaronorosen/horizon-congress,philoniare/horizon,Mirantis/mos-horizon,vbannai/disk-qos-horizon,RudoCris/horizon,endorphinl/horizon-fork,eayunstack/horizon,vladryk/horizon,karthik-suresh/horizon,1ukash/horizon,Hodorable/0602,j4/horizon,blueboxgroup/horizon,Hodorable/0602,dan1/horizon-proto,FNST-OpenStack/horizon,idjaw/horizon,mrunge/horizon_lib,wolverineav/horizon,ikargis/horizon_fod,idjaw/horizon,ikargis/horizon_fod,newrocknj/horizon,openstack-ja/horizon,wolverineav/horizon,takeshineshiro/horizon,icloudrnd/automation_tools,mrunge/horizon,henaras/horizon,mrunge/horizon_lib,doug-fish/horizon,LabAdvComp/tukey_portal,rdo-management/tuskar-ui,flochaz/horizon,VaneCloud/horizon,henaras/horizon,wangxiangyu/horizon,bigswitch/horizon,takeshineshiro/horizon,yjxtogo/horizon,JioCloud/horizon,LabAdvComp/tukey_portal,dan1/horizon-proto,dan1/horizon-x509,wolverineav/horizon,NCI-Cloud/horizon,Metaswitch/horizon,promptworks/horizon,tqtran7/horizon,davidcusatis/horizon,eayunstack/horizon,agileblaze/OpenStackTwoFactorAuthentication,Mirantis/mos-horizon,99cloud/keystone_register,FNST-OpenStack/horizon,nvoron23/avos,xme1226/horizon,gerrive/horizon,philoniare/horizon,endorphinl/horizon-fork,Tesora/tesora-horizon,sandvine/horizon,zouyapeng/horizon,CiscoSystems/horizon,redhat-cip/horizon,redhat-cip/horizon,endorphinl/horizon,promptworks/horizon,wolverineav/horizon,openstack/horizon,yanheven/console,mandeepdhami/horizon,Dark-Hacker/horizon,coreycb/horizon,bigswitch/horizon,j4/horizon,luhanhan/horizon,izadorozhna/dashboard_integration_tests,VaneCloud/horizon,occ-data/tukey-portal,opencloudconsortium/tukey-portal,orbitfp7/horizon,redhat-openstack/horizon,tqtran7/horizon,ging/horizon,rdo-management/tuskar-ui,agileblaze/OpenStackTwoFactorAuthentication,henaras/horizon,zouyapeng/horizon,blueboxgroup/horizon,Frostman/eho-horizon,anthonydillon/horizon,luhanhan/horizon,aaronorosen/horizon-congress,spring-week-topos/horizon-week,citrix-openstack-build/horizon,bac/horizon,bac/horizon,tsufiev/horizon,saydulk/horizon,redhat-openstack/horizon,orbitfp7/horizon,yanheven/console,newrocknj/horizon,sandvine/horizon,tuskar/tuskar-ui,watonyweng/horizon,davidcusatis/horizon,openstack-ja/horizon,luhanhan/horizon,Frostman/eho-horizon,spring-week-topos/horizon-week,izadorozhna/dashboard_integration_tests,NCI-Cloud/horizon,xinwu/horizon,doug-fish/horizon,xinwu/horizon,gerrive/horizon,CiscoSystems/horizon,CiscoSystems/horizon,gochist/horizon,dan1/horizon-x509,agileblaze/OpenStackTwoFactorAuthentication,occ-data/tukey-portal,orbitfp7/horizon,tsufiev/horizon,mdavid/horizon,idjaw/horizon,noironetworks/horizon,endorphinl/horizon-fork,Frostman/eho-horizon,JioCloud/horizon,Solinea/horizon,xinwu/horizon,yjxtogo/horizon,yeming233/horizon,kfox1111/horizon,yeming233/horizon,RudoCris/horizon,doug-fish/horizon,vladryk/horizon,vladryk/horizon,tuskar/tuskar-ui,ChameleonCloud/horizon,tsufiev/horizon,aaronorosen/horizon-congress,tellesnobrega/horizon,r-icarus/openstack_microserver,takeshineshiro/horizon,RudoCris/horizon,Dark-Hacker/horizon,wangxiangyu/horizon,yanheven/console,VaneCloud/horizon,blueboxgroup/horizon,damien-dg/horizon,ChameleonCloud/horizon,1ukash/horizon,bigswitch/horizon,Hodorable/0602,Metaswitch/horizon,rickerc/horizon_audit,damien-dg/horizon,mrunge/horizon,Solinea/horizon,tanglei528/horizon,LabAdvComp/tukey_portal,r-icarus/openstack_microserver,NeCTAR-RC/horizon,CiscoSystems/avos,promptworks/horizon,promptworks/horizon,vbannai/disk-qos-horizon,NCI-Cloud/horizon,ging/horizon,mandeepdhami/horizon,mdavid/horizon,Dark-Hacker/horizon,mrunge/horizon_lib,django-leonardo/horizon,rdo-management/tuskar-ui,kaiweifan/horizon,occ-data/tukey-portal,Metaswitch/horizon,kfox1111/horizon,luhanhan/horizon,ChameleonCloud/horizon,mrunge/openstack_horizon,saydulk/horizon,damien-dg/horizon,redhat-openstack/horizon,1ukash/horizon,xme1226/horizon,Tesora/tesora-horizon,mrunge/openstack_horizon,maestro-hybrid-cloud/horizon,gerrive/horizon,Hodorable/0602,django-leonardo/horizon,watonyweng/horizon,Metaswitch/horizon,tellesnobrega/horizon,liyitest/rr,spring-week-topos/horizon-week,gochist/horizon