auto merge of #3606 : gilles-leblanc/servo/cleanup-ini-file, r=Manishearth
auto merge of #3606 : gilles-leblanc/servo/cleanup-ini-file, r=Manishearth

All expected failures were corrected in previous commit which removed
lines from ini file but did not delete it.

samfoo/servo,kindersung/servo,echochamber/servo,mattnenterprise/servo,zhangjunlei26/servo,aweinstock314/servo,thiagopnts/servo,nnethercote/servo,peterjoel/servo,avadacatavra/servo,rixrix/servo,ConnorGBrewster/servo,nick-thompson/servo,brendandahl/servo,jlegendary/servo,samfoo/servo,tempbottle/servo,upsuper/servo,dati91/servo,GyrosOfWar/servo,runarberg/servo,larsbergstrom/servo,emilio/servo,brendandahl/servo,nnethercote/servo,GreenRecycleBin/servo,tschneidereit/servo,AnthonyBroadCrawford/servo,ruud-v-a/servo,indykish/servo,saneyuki/servo,saratang/servo,szeged/servo,splav/servo,mukilan/servo,WriterOfAlicrow/servo,peterjoel/servo,hyowon/servo,echochamber/servo,zentner-kyle/servo,snf/servo,avadacatavra/servo,mdibaiee/servo,aidanhs/servo,chotchki/servo,walac/servo,Adenilson/prototype-viewing-distance,ConnorGBrewster/servo,ConnorGBrewster/servo,pyfisch/servo,Shraddha512/servo,KiChjang/servo,evilpie/servo,indykish/servo,ryancanhelpyou/servo,indykish/servo,fiji-flo/servo,szeged/servo,ruud-v-a/servo,emilio/servo,rixrix/servo,caldwell/servo,tafia/servo,wartman4404/servo,cbrewster/servo,wpgallih/servo,akosel/servo,youprofit/servo,cbrewster/servo,akosel/servo,pyfisch/servo,ruud-v-a/servo,KiChjang/servo,evilpie/servo,dmarcos/servo,zhangjunlei26/servo,canaltinova/servo,emilio/servo,karlito40/servo,notriddle/servo,larsbergstrom/servo,mdibaiee/servo,GyrosOfWar/servo,dmarcos/servo,hyowon/servo,bjwbell/servo,g-k/servo,meh/servo,DominoTree/servo,ConnorGBrewster/servo,larsbergstrom/servo,CJ8664/servo,paulrouget/servo,jimberlage/servo,meh/servo,rixrix/servo,CJ8664/servo,karlito40/servo,splav/servo,RenaudParis/servo,wpgallih/servo,Shraddha512/servo,boghison/servo,deokjinkim/servo,saratang/servo,juzer10/servo,pyfisch/servo,pyecs/servo,dhananjay92/servo,codemac/servo,saneyuki/servo,CJ8664/servo,AnthonyBroadCrawford/servo,upsuper/servo,emilio/servo,tschneidereit/servo,chotchki/servo,AnthonyBroadCrawford/servo,s142857/servo,zhangjunlei26/servo,dsandeephegde/servo,sadmansk/servo,aidanhs/servo,jimberlage/servo,GyrosOfWar/servo,michaelwu/servo,evilpie/servo,notriddle/servo,dagnir/servo,peterjoel/servo,CJ8664/servo,froydnj/servo,rnestler/servo,saneyuki/servo,steveklabnik/servo,mattnenterprise/servo,dsandeephegde/servo,nrc/servo,peterjoel/servo,s142857/servo,ryancanhelpyou/servo,KiChjang/servo,sadmansk/servo,notriddle/servo,A-deLuna/servo,jdramani/servo,srbhklkrn/SERVOENGINE,szeged/servo,Adenilson/prototype-viewing-distance,aweinstock314/servo,cbrewster/servo,kindersung/servo,jimberlage/servo,caldwell/servo,s142857/servo,srbhklkrn/SERVOENGINE,nnethercote/servo,tschneidereit/servo,michaelwu/servo,eddyb/servo,nick-thompson/servo,nrc/servo,SimonSapin/servo,luniv/servo,RenaudParis/servo,bjwbell/servo,vks/servo,mbrubeck/servo,echochamber/servo,tempbottle/servo,mdibaiee/servo,indykish/servo,zhangjunlei26/servo,aidanhs/servo,SimonSapin/servo,pyecs/servo,shrenikgala/servo,mdibaiee/servo,RenaudParis/servo,hyowon/servo,tafia/servo,splav/servo,j3parker/servo,Adenilson/prototype-viewing-distance,Shraddha512/servo,notriddle/servo,dati91/servo,aweinstock314/servo,vks/servo,hyowon/servo,juzer10/servo,caldwell/servo,steveklabnik/servo,mattnenterprise/servo,karlito40/servo,emilio/servo,shrenikgala/servo,j3parker/servo,rixrix/servo,echochamber/servo,avadacatavra/servo,evilpie/servo,j3parker/servo,fiji-flo/servo,boghison/servo,CJ8664/servo,zhangjunlei26/servo,thiagopnts/servo,steveklabnik/servo,sadmansk/servo,nick-thompson/servo,dsandeephegde/servo,Adenilson/prototype-viewing-distance,wartman4404/servo,meh/servo,eddyb/servo,dati91/servo,zentner-kyle/servo,paulrouget/servo,saneyuki/servo,runarberg/servo,pyfisch/servo,zentner-kyle/servo,runarberg/servo,kindersung/servo,zhangjunlei26/servo,wpgallih/servo,indykish/servo,bjwbell/servo,aidanhs/servo,mt2d2/servo,snf/servo,nerith/servo,rnestler/servo,A-deLuna/servo,mbrubeck/servo,nerith/servo,jdramani/servo,splav/servo,splav/servo,KiChjang/servo,jgraham/servo,mt2d2/servo,wartman4404/servo,anthgur/servo,rentongzhang/servo,KiChjang/servo,michaelwu/servo,A-deLuna/servo,thiagopnts/servo,jgraham/servo,snf/servo,DominoTree/servo,dagnir/servo,pyecs/servo,DominoTree/servo,avadacatavra/servo,peterjoel/servo,WriterOfAlicrow/servo,froydnj/servo,anthgur/servo,shrenikgala/servo,nerith/servo,evilpie/servo,karlito40/servo,chotchki/servo,hyowon/servo,mukilan/servo,meh/servo,bjwbell/servo,cbrewster/servo,emilio/servo,canaltinova/servo,upsuper/servo,avadacatavra/servo,samfoo/servo,evilpie/servo,eddyb/servo,nnethercote/servo,hyowon/servo,dvberkel/servo,pyecs/servo,mattnenterprise/servo,SimonSapin/servo,mattnenterprise/servo,vks/servo,fiji-flo/servo,tempbottle/servo,emilio/servo,canaltinova/servo,pyfisch/servo,runarberg/servo,mukilan/servo,chotchki/servo,wartman4404/servo,codemac/servo,dati91/servo,echochamber/servo,dmarcos/servo,splav/servo,canaltinova/servo,pyecs/servo,walac/servo,DominoTree/servo,deokjinkim/servo,nrc/servo,juzer10/servo,SimonSapin/servo,cbrewster/servo,nnethercote/servo,walac/servo,steveklabnik/servo,vks/servo,walac/servo,steveklabnik/servo,pgonda/servo,aweinstock314/servo,jimberlage/servo,A-deLuna/servo,larsbergstrom/servo,wartman4404/servo,rnestler/servo,dati91/servo,luniv/servo,karlito40/servo,hyowon/servo,saratang/servo,tschneidereit/servo,thiagopnts/servo,fiji-flo/servo,A-deLuna/servo,tempbottle/servo,mbrubeck/servo,samfoo/servo,srbhklkrn/SERVOENGINE,evilpie/servo,caldwell/servo,pyfisch/servo,peterjoel/servo,jimberlage/servo,avadacatavra/servo,eddyb/servo,snf/servo,mt2d2/servo,upsuper/servo,AnthonyBroadCrawford/servo,ConnorGBrewster/servo,RenaudParis/servo,snf/servo,dati91/servo,jlegendary/servo,dmarcos/servo,mbrubeck/servo,sadmansk/servo,michaelwu/servo,pyfisch/servo,notriddle/servo,A-deLuna/servo,ruud-v-a/servo,DominoTree/servo,tafia/servo,larsbergstrom/servo,huonw/servo,mukilan/servo,eddyb/servo,rixrix/servo,bfrohs/servo,caldwell/servo,mattnenterprise/servo,tafia/servo,runarberg/servo,SimonSapin/servo,thiagopnts/servo,bjwbell/servo,dati91/servo,saneyuki/servo,tschneidereit/servo,huonw/servo,boghison/servo,larsbergstrom/servo,echochamber/servo,GyrosOfWar/servo,luniv/servo,cbrewster/servo,paulrouget/servo,juzer10/servo,upsuper/servo,peterjoel/servo,rixrix/servo,mdibaiee/servo,GreenRecycleBin/servo,paulrouget/servo,nrc/servo,youprofit/servo,michaelwu/servo,michaelwu/servo,ruud-v-a/servo,rnestler/servo,chotchki/servo,wpgallih/servo,saneyuki/servo,huonw/servo,dhananjay92/servo,samfoo/servo,wpgallih/servo,canaltinova/servo,dsandeephegde/servo,szeged/servo,juzer10/servo,froydnj/servo,notriddle/servo,bjwbell/servo,upsuper/servo,nick-thompson/servo,tschneidereit/servo,pyfisch/servo,aweinstock314/servo,jlegendary/servo,srbhklkrn/SERVOENGINE,nnethercote/servo,mt2d2/servo,deokjinkim/servo,eddyb/servo,szeged/servo,bfrohs/servo,DominoTree/servo,CJ8664/servo,upsuper/servo,brendandahl/servo,dagnir/servo,GreenRecycleBin/servo,mdibaiee/servo,jdramani/servo,nick-thompson/servo,GreenRecycleBin/servo,peterjoel/servo,dhananjay92/servo,rnestler/servo,boghison/servo,kindersung/servo,notriddle/servo,GreenRecycleBin/servo,luniv/servo,karlito40/servo,pgonda/servo,Adenilson/prototype-viewing-distance,ryancanhelpyou/servo,Shraddha512/servo,jlegendary/servo,rentongzhang/servo,DominoTree/servo,dvberkel/servo,akosel/servo,tafia/servo,deokjinkim/servo,dsandeephegde/servo,ryancanhelpyou/servo,AnthonyBroadCrawford/servo,chotchki/servo,bfrohs/servo,samfoo/servo,boghison/servo,luniv/servo,mbrubeck/servo,shrenikgala/servo,DominoTree/servo,juzer10/servo,GreenRecycleBin/servo,nerith/servo,bfrohs/servo,g-k/servo,wartman4404/servo,canaltinova/servo,huonw/servo,pyfisch/servo,zhangjunlei26/servo,nick-thompson/servo,snf/servo,youprofit/servo,dmarcos/servo,mukilan/servo,dsandeephegde/servo,dhananjay92/servo,j3parker/servo,rentongzhang/servo,nerith/servo,GyrosOfWar/servo,evilpie/servo,codemac/servo,jdramani/servo,DominoTree/servo,mattnenterprise/servo,bfrohs/servo,fiji-flo/servo,KiChjang/servo,SimonSapin/servo,KiChjang/servo,mt2d2/servo,notriddle/servo,KiChjang/servo,Shraddha512/servo,youprofit/servo,upsuper/servo,jlegendary/servo,huonw/servo,aidanhs/servo,jgraham/servo,ryancanhelpyou/servo,shrenikgala/servo,ruud-v-a/servo,szeged/servo,steveklabnik/servo,kindersung/servo,wpgallih/servo,sadmansk/servo,brendandahl/servo,peterjoel/servo,paulrouget/servo,runarberg/servo,g-k/servo,saneyuki/servo,rentongzhang/servo,szeged/servo,GyrosOfWar/servo,WriterOfAlicrow/servo,meh/servo,bfrohs/servo,tempbottle/servo,huonw/servo,srbhklkrn/SERVOENGINE,deokjinkim/servo,bjwbell/servo,sadmansk/servo,s142857/servo,kindersung/servo,emilio/servo,GreenRecycleBin/servo,snf/servo,SimonSapin/servo,srbhklkrn/SERVOENGINE,sadmansk/servo,aweinstock314/servo,szeged/servo,kindersung/servo,froydnj/servo,dhananjay92/servo,walac/servo,g-k/servo,SimonSapin/servo,jgraham/servo,saratang/servo,RenaudParis/servo,tschneidereit/servo,brendandahl/servo,GreenRecycleBin/servo,KiChjang/servo,jimberlage/servo,paulrouget/servo,larsbergstrom/servo,nerith/servo,wartman4404/servo,emilio/servo,wpgallih/servo,boghison/servo,notriddle/servo,anthgur/servo,AnthonyBroadCrawford/servo,wpgallih/servo,rentongzhang/servo,meh/servo,juzer10/servo,shrenikgala/servo,boghison/servo,jimberlage/servo,zentner-kyle/servo,s142857/servo,meh/servo,deokjinkim/servo,akosel/servo,jlegendary/servo,avadacatavra/servo,jimberlage/servo,mukilan/servo,mt2d2/servo,tempbottle/servo,anthgur/servo,anthgur/servo,rentongzhang/servo,larsbergstrom/servo,g-k/servo,CJ8664/servo,vks/servo,rentongzhang/servo,g-k/servo,pgonda/servo,g-k/servo,caldwell/servo,aidanhs/servo,jdramani/servo,zhangjunlei26/servo,eddyb/servo,aweinstock314/servo,dvberkel/servo,dhananjay92/servo,sadmansk/servo,pgonda/servo,indykish/servo,A-deLuna/servo,fiji-flo/servo,akosel/servo,s142857/servo,larsbergstrom/servo,rixrix/servo,runarberg/servo,jgraham/servo,saratang/servo,anthgur/servo,jgraham/servo,dmarcos/servo,emilio/servo,froydnj/servo,indykish/servo,CJ8664/servo,GreenRecycleBin/servo,splav/servo,brendandahl/servo,dagnir/servo,thiagopnts/servo,Shraddha512/servo,paulrouget/servo,wpgallih/servo,youprofit/servo,RenaudParis/servo,Adenilson/prototype-viewing-distance,vks/servo,codemac/servo,dagnir/servo,ConnorGBrewster/servo,KiChjang/servo,rnestler/servo,fiji-flo/servo,dmarcos/servo,nrc/servo,tafia/servo,Adenilson/prototype-viewing-distance,dati91/servo,rnestler/servo,pgonda/servo,akosel/servo,aidanhs/servo,canaltinova/servo,zentner-kyle/servo,huonw/servo,canaltinova/servo,indykish/servo,froydnj/servo,codemac/servo,dsandeephegde/servo,nnethercote/servo,karlito40/servo,dvberkel/servo,echochamber/servo,dagnir/servo,peterjoel/servo,WriterOfAlicrow/servo,zentner-kyle/servo,rnestler/servo,rixrix/servo,luniv/servo,AnthonyBroadCrawford/servo,RenaudParis/servo,splav/servo,caldwell/servo,saratang/servo,rixrix/servo,dagnir/servo,splav/servo,dsandeephegde/servo,pyecs/servo,nerith/servo,s142857/servo,walac/servo,jgraham/servo,vks/servo,eddyb/servo,j3parker/servo,youprofit/servo,zhangjunlei26/servo,youprofit/servo,shrenikgala/servo,thiagopnts/servo,nrc/servo,deokjinkim/servo,samfoo/servo,j3parker/servo,nrc/servo,srbhklkrn/SERVOENGINE,zentner-kyle/servo,dhananjay92/servo,steveklabnik/servo,WriterOfAlicrow/servo,mbrubeck/servo,jlegendary/servo,tempbottle/servo,saratang/servo,notriddle/servo,szeged/servo,saneyuki/servo,thiagopnts/servo,dvberkel/servo,cbrewster/servo,dvberkel/servo,cbrewster/servo,anthgur/servo,indykish/servo,jdramani/servo,saneyuki/servo,paulrouget/servo,luniv/servo,evilpie/servo,mt2d2/servo,mattnenterprise/servo,Shraddha512/servo,jdramani/servo,dvberkel/servo,GyrosOfWar/servo,codemac/servo,jimberlage/servo,nnethercote/servo,pgonda/servo,ConnorGBrewster/servo,pyecs/servo,ConnorGBrewster/servo,tafia/servo,akosel/servo,splav/servo,paulrouget/servo,pgonda/servo,ryancanhelpyou/servo,saneyuki/servo,mbrubeck/servo,nnethercote/servo,brendandahl/servo,DominoTree/servo,j3parker/servo,WriterOfAlicrow/servo,anthgur/servo,avadacatavra/servo,szeged/servo,mbrubeck/servo,nnethercote/servo,pyfisch/servo,nick-thompson/servo,WriterOfAlicrow/servo,codemac/servo,paulrouget/servo,walac/servo,fiji-flo/servo,mdibaiee/servo,larsbergstrom/servo,ryancanhelpyou/servo