auto merge of #4992 : psdh/servo/cargodir, r=Manishearth
auto merge of #4992 : psdh/servo/cargodir, r=Manishearth

Fixes #4976

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