some quick fixes to cli, tests incoming
some quick fixes to cli, tests incoming

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