Merge "use SettableFuture/FutureCallback when possible in FortuneTest"