Reverting "[utils] buildbot-script.sh: factor out common configuration options"
Reverting "[utils] buildbot-script.sh: factor out common configuration options"

The last commit broke the buildbot; fixing.

Swift SVN r10401

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