The travis should run almost all jobs unless it takes really long time, however it does not take too long for now. So it’s time for moving it to normal job.
(The test sort is to see how many conflict will this cause, will drop it if there are too many)
The first commit can be reviewed by git diff --color-moved=plain