Merge r1092076, r1100513: Try to prevent a single long request marking a worker in error. Submitted by: jfclere Reviewd by: jfclere, rjung, rpluem