Clean up a couple deprecation warnings
Clean up a couple deprecation warnings

Change-Id: Ic293402702981cea124d0dc57e95341fda7eaf99

smerritt/swift,dencaval/swift,swiftstack/swift,prashanthpai/swift,wenhuizhang/swift,maginatics/swift,bradleypj823/swift,redbo/swift,nadeemsyed/swift,wenhuizhang/swift,williamthegrey/swift,mjzmjz/swift,thiagodasilva/swift,smerritt/swift,IPVL/swift-kilo,clayg/swift,clayg/swift,clayg/swift,levythu/swift,eatbyte/Swift,AfonsoFGarcia/swift,matthewoliver/swift,bouncestorage/swift,tipabu/swift,zackmdavis/swift,nadeemsyed/swift,tipabu/swift,larsbutler/swift,swiftstack/swift,Seagate/swift,smerritt/swift,tipabu/swift,revoer/keystone-8.0.0,nadeemsyed/swift,hbhdytf/mac2,hurricanerix/swift,anishnarang/gswift,daasbank/swift,eatbyte/Swift,notmyname/swift,thiagodasilva/swift,hbhdytf/mac2,hbhdytf/mac2,swiftstack/swift,Em-Pan/swift,bradleypj823/swift,IPVL/swift-kilo,mjwtom/swift,notmyname/swift,iostackproject/IO-Bandwidth-Differentiation,aerwin3/swift,daasbank/swift,psachin/swift,AfonsoFGarcia/swift,nadeemsyed/swift,notmyname/swift,williamthegrey/swift,psachin/swift,maginatics/swift,Akanoa/swift,levythu/swift,hbhdytf/mac,clayg/swift,redbo/swift,rackerlabs/swift,mjwtom/swift,smerritt/swift,redhat-openstack/swift,takeshineshiro/swift,anishnarang/gswift,matthewoliver/swift,notmyname/swift,larsbutler/swift,matthewoliver/swift,zackmdavis/swift,mjzmjz/swift,bkolli/swift,psachin/swift,gold3bear/swift,bkolli/swift,openstack/swift,hurricanerix/swift,Akanoa/swift,hurricanerix/swift,shibaniahegde/OpenStak_swift,Seagate/swift,prashanthpai/swift,revoer/keystone-8.0.0,gold3bear/swift,Em-Pan/swift,dpgoetz/swift,openstack/swift,hbhdytf/mac,rackerlabs/swift,aerwin3/swift,openstack/swift,bouncestorage/swift,dpgoetz/swift,takeshineshiro/swift,psachin/swift,openstack/swift,hbhdytf/mac2,tipabu/swift,hurricanerix/swift,matthewoliver/swift,shibaniahegde/OpenStak_swift,iostackproject/IO-Bandwidth-Differentiation,redhat-openstack/swift,dencaval/swift