Fix up the tests which were failing after my patch and bring back the patch.
Fix up the tests which were failing after my patch and
bring back the patch.


Swift SVN r12263

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