Take two ubuntu jobs off their own runners: absorb one, delete the other (#9360)