Undo some ineffective optimizations.

Allow streaming queries to complete on shutdown.
Don't throttle streaming queries till first row return. It doesn't
help.
Merge branch 'better-timeouts'