Revert "Revert "Add a 5 minute timeout for cpu hogs""

This reverts commit eb953d0dbd15bb7550688fad720da20214c59d63 
and re-enables 84ad6b2e on master now that we have deployed.

Change-Id: I7ba672eb7a1a7aae6ac92b44fdab837a354064c5
Revert "Revert "fixup! Send done on error too""

This reverts commit 03830b86aaadc00c99ba2157bded0f57fb1a35fb
and reenables b24cae82 on master now that we've deployed.

Change-Id: If267019c53345136f0d3e807a88b4c3e0442382d
Merge "Revert "Revert "Add a 5 minute timeout for cpu hogs"""
Merge "Revert "Revert "fixup! Send done on error too"""