Fixed bug 905422. Swift caching should work again.  Also fixed a few other minor syntactical stuff.
Fixed bug 905422.
Swift caching should work again.  Also fixed a few other minor
syntactical stuff.

Change-Id: I76eb0ed283dd8d2726179803e2fd8b9eaa6d1642

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