Fixing some comments.
Merge branch 'master' of github.com:youtube/vitess
Fix in zkocc client with a single server.

In that case, we would never try to reconnect. Now we do.
Throttle for streaming queries.

Also includes changes to semaphore to support timeouts.
Throttle for streaming queries.

Also includes changes to semaphore to support timeouts.
Fix vtbarnacle, add delay support in sandbox.
Merge branch 'stream-throttle'
Merge branch 'master' into barnacle