Simplify FailOnTimeout by using FutureTask
Merge pull request #657 from kcooney/simplify-fail-on-timeout

Simplify FailOnTimeout by using FutureTask