use the roles in the token when recreating
use the roles in the token when recreating

related bug:
https://bugs.launchpad.net/keystone/+bug/1159987

Change-Id: I98e1b71d5b7de7867945294ebd569efd2cd7314b

MaheshIBM/keystone,openstack/keystone,ilay09/keystone,jumpstarter-io/keystone,cernops/keystone,ajayaa/keystone,JioCloud/keystone,derekchiang/keystone,cbrucks/Federated_Keystone,openstack/keystone,idjaw/keystone,dstanek/keystone,blueboxgroup/keystone,cbrucks/Federated_Keystone,promptworks/keystone,idjaw/keystone,kwss/keystone,reeshupatel/demo,rickerc/keystone_audit,derekchiang/keystone,dsiddharth/access-keys,jonnary/keystone,rodrigods/keystone,takeshineshiro/keystone,roopali8/keystone,jumpstarter-io/keystone,reeshupatel/demo,ilay09/keystone,rickerc/keystone_audit,citrix-openstack-build/keystone,rajalokan/keystone,jamielennox/keystone,reeshupatel/demo,cloudbau/keystone,kwss/keystone,promptworks/keystone,rushiagr/keystone,jonnary/keystone,mahak/keystone,derekchiang/keystone,townbull/keystone-dtrust,dsiddharth/access-keys,mahak/keystone,ilay09/keystone,kwss/keystone,rajalokan/keystone,MaheshIBM/keystone,dstanek/keystone,townbull/keystone-dtrust,cbrucks/Federated_Keystone,promptworks/keystone,rickerc/keystone_audit,citrix-openstack-build/keystone,himanshu-setia/keystone,blueboxgroup/keystone,maestro-hybrid-cloud/keystone,ntt-sic/keystone,takeshineshiro/keystone,nuxeh/keystone,vivekdhayaal/keystone,cloudbau/keystone,klmitch/keystone,cernops/keystone,jamielennox/keystone,mahak/keystone,ging/keystone,cloudbau/keystone,klmitch/keystone,dsiddharth/access-keys,maestro-hybrid-cloud/keystone,UTSA-ICS/keystone-kerberos,jumpstarter-io/keystone,JioCloud/keystone,dims/keystone,nuxeh/keystone,vivekdhayaal/keystone,nuxeh/keystone,rushiagr/keystone,townbull/keystone-dtrust,ging/keystone,dstanek/keystone,openstack/keystone,dims/keystone,roopali8/keystone,UTSA-ICS/keystone-kerberos,citrix-openstack-build/keystone,ntt-sic/keystone,rushiagr/keystone,ntt-sic/keystone,rodrigods/keystone,vivekdhayaal/keystone,rajalokan/keystone,himanshu-setia/keystone,ajayaa/keystone