Cludge for a problem where benchmark_timer is reset (because benchmark time
was reached) but the benchmark timer is still active, leading to SIGALRM with
no handler. If we ever saw benchmark_running, we keep away for good.
Merge branch 'unstable-jumbo' into bleeding-jumbo

* unstable-jumbo:
  Cludge for a problem where benchmark_timer is reset (because benchmark time was reached) but the benchmark timer is still active, leading to SIGALRM with no handler. If we ever saw benchmark_running, we keep away for good.