Make keystone_data.sh handle existing and updated keystone client
Make keystone_data.sh handle existing and updated keystone client

Keystone client commands and options have been normalized and
keystone_data.sh needs to support both versions for a transition
period.

The merge prop for the updated keystone client is
https://review.openstack.org/4375

Necessary for bug 396422

Also fix an intermittent problem extacting IDs from command output.

Change-Id: Ib13445a0bd3029fb02b0b7a86e8e0b8278717b57

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