auto merge of #5259 : frewsxcv/servo/constellation-cleanup, r=glennw
auto merge of #5259 : frewsxcv/servo/constellation-cleanup, r=glennw

I messed up #5255

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