Remove temporary fix for keystone.conf file.
Remove temporary fix for keystone.conf file.

Fixed in https://review.openstack.org/#change,6387.

Change-Id: I7fd73fa2658fcb8ba3a6db4d19ebde25e67cfbda

bljgaurav/openstack-test,costingalan/devstack,avvocatodemarchis/devstack,dtroyer/devstack,cloudbuilders/devstack,ykaneko/devstack,affo/devstack,TwinkleChawla/devstack,varunarya10/devstack,bigswitch/devstack,richliu/devstack,liuquansheng47/devstack,cloudbuilders/devstack,sc68cal/devstack,wenhuizhang/devstack,upadhyay-prashant/devstack,nawawi/openstack,dtroyer/devstack,citrix-openstack-build/devstack,promptworks/devstack,kplus/devstack-moonshot,thomasem/devstack,bljgaurav/openstack-test,promptworks/devstack,JioCloud/devstack,citrix-openstack-build/devstack,nati/devstack_public,bswartz/devstack,Millnert/contrail-devstack,LoHChina/devstack,richliu/devstack,ewindisch/raspi-devstack,CloudServer/devstack,andrewrothstein/devstack,nttmcl/devstack_public,prithivm/branch01,samgoon/devstack,mmasaki/devstack,mssumanth/devstack,ykaneko/devstack,tianweizhang/devstack,Juniper/devstack,ozamiatin/devstack,shootstar/devstacktest,innodee/openstackk,mmasaki/devstack,samgoon/devstack,upadhyay-prashant/devstack,bq-xiao/devstack,sc68cal/devstack,affo/devstack,Mahito/devstack,mc2014/devstack,Yuriy-Leonov/devstack,avvocatodemarchis/devstack,flavio-fernandes/devstack,neerja28/Devstack_GlusterFS,thomasem/devstack,nuxeh/devstack,LoHChina/devstack,savi-dev/devstack,vsham20/devstack,sequenceiq/devstack,kplus/devstack-moonshot,wenhuizhang/devstack,herrsechs/devstack,CloudServer/devstack,sequenceiq/devstack,eharney/devstack,neerja28/Devstack_GlusterFS,nuxeh/devstack,vishnugonela/devstack,deepakselvaraj/devstack,ewindisch/raspi-devstack,jamielennox/devstack,atulpatil301/devstack,vishnugonela/devstack,noironetworks/devstack,eharney/devstack,bswartz/devstack,nttmcl/devstack_public,j4/devstack,parul24/devstack,ozamiatin/devstack,williamthegrey/devstack,armando-migliaccio/devstack,openstack-dev/devstack,nawawi/openstack,group-policy/devstack,openstack-dev/devstack,CiscoSystems/devstack,andrewrothstein/devstack,atulpatil301/devstack,mssumanth/devstack,NaokiMiyata/devstack,yamt/devstack,prithivm/branch01,pczerkas/devstack,rushiagr/devstack,tianweizhang/devstack,r-mibu/devstack,TwinkleChawla/devstack,NaokiMiyata/devstack,HPCHub/devstack,costingalan/devstack,liuquansheng47/devstack,pczerkas/devstack,bq-xiao/devstack,virtualopensystems/devstack,pacinete/devstack,rushiagr/devstack,herrsechs/devstack,olivierlemasle/devstack,sstrato/devstack,noironetworks/devstack,pombredanne/devstack,inkerra/devstack,dirkmueller/devstack,mc2014/devstack,savi-dev/devstack,BSJAIN92/OpenStack,vsham20/devstack,r-mibu/devstack,pacinete/devstack,j4/devstack,varunarya10/devstack,Mahito/devstack,dirkmueller/devstack,srics/devstack,flavio-fernandes/devstack,nati/devstack_public,eshnil2000/devstack,olivierlemasle/devstack,parul24/devstack,pombredanne/devstack,HPCHub/devstack,bigswitch/devstack,group-policy/devstack,BSJAIN92/OpenStack