backport some asserts
backport some asserts

Change-Id: I4f3baf5c03d2a212ecc9d2eb4375b5e9c978ffa4

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