8168414: Various timeouthandler fixes

Reviewed-by: mlarsson
2 files changed