avoid closing yielder prematurely
Merge pull request #597 from metamx/fix-yielder-close

avoid closing yielder prematurely
fix missing return statement
fix query cancellation test race condition
Merge branch 'master' of github.com:metamx/druid into new-guava
fix bad merge