Fix keystone_data.sh to match default_catalog.templates
Fix keystone_data.sh to match default_catalog.templates

Endpoint creating in keystone_data.sh tends to drift because
KEYSTONE_CATALOG_BACKEND=sql is not the default.

This patch should bring them closer together, and fix a problem I was having
with keystone auth

Change-Id: Ifac57b8e69234975d1ff65ace72d46d3a5808119

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