My previous patch didn't work.
So it no longer times out on s390 or armel (patch bootstraptest_increase_timeout.diff).