fix a case where a segment may get stuck in the terminate queue
Merge branch 'master' of github.com:metamx/druid