Auto merge of #19926 - servo:jdm-patch-13, r=emilio
Auto merge of #19926 - servo:jdm-patch-13, r=emilio

Make the syncing PR a bit harder to mess up.

While the system is in testing, it's best to err on the side of making the PRs harder to merge.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/19926)
<!-- Reviewable:end -->

upsuper/servo,sadmansk/servo,pyfisch/servo,canaltinova/servo,paulrouget/servo,paulrouget/servo,notriddle/servo,mbrubeck/servo,KiChjang/servo,mattnenterprise/servo,notriddle/servo,mattnenterprise/servo,szeged/servo,SimonSapin/servo,paulrouget/servo,dati91/servo,mbrubeck/servo,DominoTree/servo,emilio/servo,KiChjang/servo,larsbergstrom/servo,KiChjang/servo,pyfisch/servo,peterjoel/servo,mattnenterprise/servo,larsbergstrom/servo,SimonSapin/servo,pyfisch/servo,cbrewster/servo,saneyuki/servo,avadacatavra/servo,larsbergstrom/servo,avadacatavra/servo,canaltinova/servo,mbrubeck/servo,splav/servo,peterjoel/servo,upsuper/servo,ConnorGBrewster/servo,pyfisch/servo,anthgur/servo,pyfisch/servo,DominoTree/servo,upsuper/servo,jimberlage/servo,saneyuki/servo,larsbergstrom/servo,peterjoel/servo,paulrouget/servo,KiChjang/servo,pyfisch/servo,splav/servo,fiji-flo/servo,emilio/servo,canaltinova/servo,splav/servo,notriddle/servo,mbrubeck/servo,SimonSapin/servo,SimonSapin/servo,avadacatavra/servo,dati91/servo,sadmansk/servo,pyfisch/servo,avadacatavra/servo,peterjoel/servo,upsuper/servo,saneyuki/servo,KiChjang/servo,splav/servo,szeged/servo,emilio/servo,SimonSapin/servo,anthgur/servo,emilio/servo,notriddle/servo,notriddle/servo,mattnenterprise/servo,larsbergstrom/servo,szeged/servo,KiChjang/servo,ConnorGBrewster/servo,canaltinova/servo,splav/servo,fiji-flo/servo,ConnorGBrewster/servo,splav/servo,peterjoel/servo,KiChjang/servo,anthgur/servo,nnethercote/servo,nnethercote/servo,mattnenterprise/servo,paulrouget/servo,saneyuki/servo,larsbergstrom/servo,sadmansk/servo,larsbergstrom/servo,notriddle/servo,nnethercote/servo,sadmansk/servo,jimberlage/servo,splav/servo,canaltinova/servo,cbrewster/servo,jimberlage/servo,jimberlage/servo,ConnorGBrewster/servo,notriddle/servo,nnethercote/servo,canaltinova/servo,upsuper/servo,saneyuki/servo,ConnorGBrewster/servo,fiji-flo/servo,upsuper/servo,KiChjang/servo,cbrewster/servo,avadacatavra/servo,paulrouget/servo,dati91/servo,paulrouget/servo,pyfisch/servo,anthgur/servo,splav/servo,DominoTree/servo,cbrewster/servo,mbrubeck/servo,anthgur/servo,SimonSapin/servo,dati91/servo,upsuper/servo,jimberlage/servo,notriddle/servo,emilio/servo,mbrubeck/servo,fiji-flo/servo,anthgur/servo,fiji-flo/servo,saneyuki/servo,peterjoel/servo,DominoTree/servo,avadacatavra/servo,avadacatavra/servo,szeged/servo,dati91/servo,mattnenterprise/servo,peterjoel/servo,mbrubeck/servo,nnethercote/servo,anthgur/servo,saneyuki/servo,avadacatavra/servo,nnethercote/servo,upsuper/servo,DominoTree/servo,nnethercote/servo,peterjoel/servo,splav/servo,SimonSapin/servo,larsbergstrom/servo,szeged/servo,emilio/servo,ConnorGBrewster/servo,sadmansk/servo,emilio/servo,canaltinova/servo,szeged/servo,emilio/servo,paulrouget/servo,jimberlage/servo,emilio/servo,KiChjang/servo,cbrewster/servo,saneyuki/servo,fiji-flo/servo,splav/servo,dati91/servo,cbrewster/servo,paulrouget/servo,notriddle/servo,sadmansk/servo,KiChjang/servo,saneyuki/servo,ConnorGBrewster/servo,DominoTree/servo,fiji-flo/servo,larsbergstrom/servo,nnethercote/servo,cbrewster/servo,nnethercote/servo,saneyuki/servo,anthgur/servo,ConnorGBrewster/servo,mattnenterprise/servo,cbrewster/servo,sadmansk/servo,mbrubeck/servo,dati91/servo,pyfisch/servo,canaltinova/servo,szeged/servo,peterjoel/servo,DominoTree/servo,emilio/servo,fiji-flo/servo,szeged/servo,pyfisch/servo,jimberlage/servo,sadmansk/servo,peterjoel/servo,paulrouget/servo,DominoTree/servo,mattnenterprise/servo,DominoTree/servo,jimberlage/servo,dati91/servo,DominoTree/servo,szeged/servo,notriddle/servo,jimberlage/servo,nnethercote/servo,SimonSapin/servo,larsbergstrom/servo,szeged/servo