fix some test failures from my last commit.
fix some test failures from my last commit.


Swift SVN r11212

stephentyrone/swift,tkremenek/swift,gottesmm/swift,kusl/swift,tkremenek/swift,adrfer/swift,sschiau/swift,kentya6/swift,mightydeveloper/swift,aschwaighofer/swift,arvedviehweger/swift,LeoShimonaka/swift,glessard/swift,russbishop/swift,Ivacker/swift,devincoughlin/swift,tkremenek/swift,khizkhiz/swift,JGiola/swift,gmilos/swift,MukeshKumarS/Swift,xwu/swift,hughbe/swift,glessard/swift,austinzheng/swift,gottesmm/swift,modocache/swift,calebd/swift,zisko/swift,brentdax/swift,xwu/swift,tinysun212/swift-windows,jckarter/swift,airspeedswift/swift,cbrentharris/swift,frootloops/swift,tardieu/swift,parkera/swift,JaSpa/swift,milseman/swift,bitjammer/swift,khizkhiz/swift,Jnosh/swift,mightydeveloper/swift,nathawes/swift,djwbrown/swift,Jnosh/swift,practicalswift/swift,jtbandes/swift,calebd/swift,manavgabhawala/swift,huonw/swift,LeoShimonaka/swift,manavgabhawala/swift,jtbandes/swift,sschiau/swift,practicalswift/swift,deyton/swift,johnno1962d/swift,gregomni/swift,frootloops/swift,codestergit/swift,roambotics/swift,return/swift,airspeedswift/swift,allevato/swift,emilstahl/swift,glessard/swift,JGiola/swift,jmgc/swift,slavapestov/swift,dduan/swift,kentya6/swift,frootloops/swift,Ivacker/swift,roambotics/swift,gribozavr/swift,roambotics/swift,xwu/swift,manavgabhawala/swift,airspeedswift/swift,adrfer/swift,jopamer/swift,jtbandes/swift,jopamer/swift,swiftix/swift.old,jopamer/swift,dduan/swift,swiftix/swift.old,OscarSwanros/swift,sdulal/swift,gottesmm/swift,allevato/swift,atrick/swift,manavgabhawala/swift,adrfer/swift,amraboelela/swift,rudkx/swift,ken0nek/swift,manavgabhawala/swift,shajrawi/swift,shahmishal/swift,codestergit/swift,djwbrown/swift,Ivacker/swift,lorentey/swift,kentya6/swift,rudkx/swift,slavapestov/swift,alblue/swift,ahoppen/swift,bitjammer/swift,gmilos/swift,jmgc/swift,rudkx/swift,KrishMunot/swift,aschwaighofer/swift,huonw/swift,codestergit/swift,Ivacker/swift,cbrentharris/swift,lorentey/swift,rudkx/swift,stephentyrone/swift,zisko/swift,stephentyrone/swift,arvedviehweger/swift,Ivacker/swift,emilstahl/swift,JGiola/swift,jopamer/swift,calebd/swift,huonw/swift,xedin/swift,ken0nek/swift,CodaFi/swift,SwiftAndroid/swift,jtbandes/swift,jckarter/swift,emilstahl/swift,austinzheng/swift,airspeedswift/swift,gmilos/swift,bitjammer/swift,MukeshKumarS/Swift,mightydeveloper/swift,parkera/swift,xedin/swift,JaSpa/swift,swiftix/swift.old,kperryua/swift,shahmishal/swift,jmgc/swift,emilstahl/swift,gottesmm/swift,tinysun212/swift-windows,arvedviehweger/swift,KrishMunot/swift,tjw/swift,tjw/swift,jmgc/swift,felix91gr/swift,tinysun212/swift-windows,karwa/swift,JaSpa/swift,gribozavr/swift,atrick/swift,swiftix/swift.old,uasys/swift,therealbnut/swift,sschiau/swift,Jnosh/swift,dreamsxin/swift,CodaFi/swift,Ivacker/swift,shahmishal/swift,swiftix/swift,apple/swift,danielmartin/swift,ben-ng/swift,tardieu/swift,jopamer/swift,MukeshKumarS/Swift,milseman/swift,benlangmuir/swift,natecook1000/swift,parkera/swift,swiftix/swift,tinysun212/swift-windows,felix91gr/swift,arvedviehweger/swift,shahmishal/swift,sschiau/swift,OscarSwanros/swift,khizkhiz/swift,kentya6/swift,shajrawi/swift,harlanhaskins/swift,KrishMunot/swift,bitjammer/swift,aschwaighofer/swift,khizkhiz/swift,dreamsxin/swift,slavapestov/swift,gribozavr/swift,kusl/swift,practicalswift/swift,brentdax/swift,calebd/swift,parkera/swift,IngmarStein/swift,mightydeveloper/swift,devincoughlin/swift,amraboelela/swift,aschwaighofer/swift,return/swift,milseman/swift,ken0nek/swift,apple/swift,benlangmuir/swift,IngmarStein/swift,airspeedswift/swift,shahmishal/swift,tinysun212/swift-windows,Jnosh/swift,russbishop/swift,tardieu/swift,xwu/swift,hooman/swift,adrfer/swift,kperryua/swift,therealbnut/swift,kentya6/swift,slavapestov/swift,devincoughlin/swift,practicalswift/swift,felix91gr/swift,atrick/swift,LeoShimonaka/swift,KrishMunot/swift,atrick/swift,JGiola/swift,KrishMunot/swift,kstaring/swift,hooman/swift,austinzheng/swift,Jnosh/swift,rudkx/swift,xedin/swift,khizkhiz/swift,nathawes/swift,parkera/swift,benlangmuir/swift,uasys/swift,jmgc/swift,devincoughlin/swift,gmilos/swift,kentya6/swift,tjw/swift,devincoughlin/swift,jmgc/swift,nathawes/swift,brentdax/swift,alblue/swift,dduan/swift,gribozavr/swift,xwu/swift,ken0nek/swift,kstaring/swift,johnno1962d/swift,brentdax/swift,IngmarStein/swift,Jnosh/swift,hughbe/swift,glessard/swift,manavgabhawala/swift,shajrawi/swift,Ivacker/swift,IngmarStein/swift,gregomni/swift,uasys/swift,tinysun212/swift-windows,MukeshKumarS/Swift,cbrentharris/swift,harlanhaskins/swift,modocache/swift,practicalswift/swift,return/swift,benlangmuir/swift,johnno1962d/swift,cbrentharris/swift,SwiftAndroid/swift,shajrawi/swift,tjw/swift,danielmartin/swift,lorentey/swift,tjw/swift,lorentey/swift,djwbrown/swift,felix91gr/swift,mightydeveloper/swift,gregomni/swift,sdulal/swift,IngmarStein/swift,swiftix/swift.old,alblue/swift,modocache/swift,hooman/swift,gregomni/swift,kperryua/swift,harlanhaskins/swift,KrishMunot/swift,xwu/swift,return/swift,xwu/swift,jtbandes/swift,LeoShimonaka/swift,kentya6/swift,return/swift,gribozavr/swift,allevato/swift,kperryua/swift,practicalswift/swift,huonw/swift,hughbe/swift,karwa/swift,manavgabhawala/swift,practicalswift/swift,huonw/swift,ken0nek/swift,roambotics/swift,JaSpa/swift,xedin/swift,gmilos/swift,deyton/swift,stephentyrone/swift,kperryua/swift,mightydeveloper/swift,kusl/swift,jckarter/swift,hooman/swift,sdulal/swift,swiftix/swift,felix91gr/swift,hughbe/swift,SwiftAndroid/swift,jopamer/swift,austinzheng/swift,benlangmuir/swift,kusl/swift,bitjammer/swift,tardieu/swift,codestergit/swift,emilstahl/swift,sschiau/swift,huonw/swift,MukeshKumarS/Swift,tardieu/swift,kusl/swift,emilstahl/swift,swiftix/swift,johnno1962d/swift,OscarSwanros/swift,danielmartin/swift,tkremenek/swift,gribozavr/swift,huonw/swift,xedin/swift,modocache/swift,harlanhaskins/swift,johnno1962d/swift,nathawes/swift,karwa/swift,arvedviehweger/swift,hughbe/swift,felix91gr/swift,hooman/swift,milseman/swift,gmilos/swift,LeoShimonaka/swift,natecook1000/swift,slavapestov/swift,alblue/swift,practicalswift/swift,modocache/swift,swiftix/swift,uasys/swift,dduan/swift,sdulal/swift,IngmarStein/swift,gmilos/swift,milseman/swift,LeoShimonaka/swift,jtbandes/swift,sdulal/swift,JaSpa/swift,ben-ng/swift,deyton/swift,gottesmm/swift,kusl/swift,russbishop/swift,milseman/swift,parkera/swift,ahoppen/swift,djwbrown/swift,tjw/swift,gottesmm/swift,modocache/swift,gregomni/swift,natecook1000/swift,therealbnut/swift,austinzheng/swift,zisko/swift,kusl/swift,tinysun212/swift-windows,gregomni/swift,slavapestov/swift,emilstahl/swift,bitjammer/swift,aschwaighofer/swift,return/swift,therealbnut/swift,CodaFi/swift,jckarter/swift,shahmishal/swift,mightydeveloper/swift,swiftix/swift.old,dduan/swift,tardieu/swift,aschwaighofer/swift,sdulal/swift,benlangmuir/swift,sdulal/swift,nathawes/swift,kstaring/swift,dduan/swift,gottesmm/swift,lorentey/swift,amraboelela/swift,atrick/swift,parkera/swift,felix91gr/swift,codestergit/swift,tardieu/swift,natecook1000/swift,tjw/swift,uasys/swift,KrishMunot/swift,jmgc/swift,harlanhaskins/swift,xedin/swift,swiftix/swift.old,slavapestov/swift,shajrawi/swift,devincoughlin/swift,ben-ng/swift,stephentyrone/swift,codestergit/swift,jckarter/swift,cbrentharris/swift,nathawes/swift,karwa/swift,shajrawi/swift,ahoppen/swift,ben-ng/swift,stephentyrone/swift,SwiftAndroid/swift,djwbrown/swift,MukeshKumarS/Swift,parkera/swift,zisko/swift,xedin/swift,allevato/swift,brentdax/swift,CodaFi/swift,JaSpa/swift,modocache/swift,johnno1962d/swift,milseman/swift,djwbrown/swift,shajrawi/swift,SwiftAndroid/swift,austinzheng/swift,ken0nek/swift,deyton/swift,OscarSwanros/swift,zisko/swift,shahmishal/swift,Jnosh/swift,hooman/swift,brentdax/swift,OscarSwanros/swift,alblue/swift,kperryua/swift,natecook1000/swift,Ivacker/swift,kstaring/swift,jtbandes/swift,jckarter/swift,danielmartin/swift,djwbrown/swift,cbrentharris/swift,kperryua/swift,OscarSwanros/swift,amraboelela/swift,allevato/swift,johnno1962d/swift,shahmishal/swift,airspeedswift/swift,therealbnut/swift,glessard/swift,xedin/swift,karwa/swift,nathawes/swift,CodaFi/swift,amraboelela/swift,arvedviehweger/swift,tkremenek/swift,ken0nek/swift,harlanhaskins/swift,frootloops/swift,swiftix/swift.old,jopamer/swift,deyton/swift,khizkhiz/swift,calebd/swift,LeoShimonaka/swift,danielmartin/swift,hughbe/swift,adrfer/swift,kusl/swift,russbishop/swift,natecook1000/swift,natecook1000/swift,atrick/swift,devincoughlin/swift,uasys/swift,CodaFi/swift,stephentyrone/swift,sschiau/swift,therealbnut/swift,zisko/swift,allevato/swift,devincoughlin/swift,hooman/swift,russbishop/swift,therealbnut/swift,ben-ng/swift,alblue/swift,roambotics/swift,danielmartin/swift,kstaring/swift,IngmarStein/swift,JaSpa/swift,cbrentharris/swift,emilstahl/swift,sschiau/swift,codestergit/swift,mightydeveloper/swift,shajrawi/swift,dduan/swift,lorentey/swift,rudkx/swift,OscarSwanros/swift,danielmartin/swift,apple/swift,CodaFi/swift,glessard/swift,apple/swift,kstaring/swift,frootloops/swift,adrfer/swift,karwa/swift,kstaring/swift,russbishop/swift,austinzheng/swift,aschwaighofer/swift,uasys/swift,roambotics/swift,ben-ng/swift,harlanhaskins/swift,MukeshKumarS/Swift,JGiola/swift,ahoppen/swift,russbishop/swift,gribozavr/swift,return/swift,JGiola/swift,alblue/swift,SwiftAndroid/swift,swiftix/swift,adrfer/swift,calebd/swift,lorentey/swift,amraboelela/swift,ahoppen/swift,swiftix/swift,frootloops/swift,zisko/swift,sschiau/swift,frootloops/swift,lorentey/swift,LeoShimonaka/swift,gribozavr/swift,ben-ng/swift,ahoppen/swift,deyton/swift,kentya6/swift,calebd/swift,allevato/swift,jckarter/swift,airspeedswift/swift,apple/swift,deyton/swift,sdulal/swift,apple/swift,amraboelela/swift,tkremenek/swift,karwa/swift,SwiftAndroid/swift,karwa/swift,hughbe/swift,khizkhiz/swift,bitjammer/swift,cbrentharris/swift,brentdax/swift,arvedviehweger/swift,tkremenek/swift