Partially reverts "97bdf57886d0a847c"
Partially reverts "97bdf57886d0a847c"

This fixes an issue where the event daemon was never actually being
terminated. Coverage shows while self.terminate gets set to True, the
log message printing the stopped message never actually gets run. This
is due to a bug where we indefinitely block for another item off the
queue in the middle of our 'while not terminate' clause.

girder/girder,Xarthisius/girder,Kitware/girder,RafaelPalomar/girder,manthey/girder,girder/girder,data-exp-lab/girder,jbeezley/girder,jbeezley/girder,Xarthisius/girder,data-exp-lab/girder,RafaelPalomar/girder,jbeezley/girder,RafaelPalomar/girder,kotfic/girder,RafaelPalomar/girder,Xarthisius/girder,girder/girder,manthey/girder,girder/girder,Kitware/girder,manthey/girder,Kitware/girder,data-exp-lab/girder,kotfic/girder,manthey/girder,kotfic/girder,Kitware/girder,jbeezley/girder,data-exp-lab/girder,kotfic/girder,kotfic/girder,RafaelPalomar/girder,data-exp-lab/girder,Xarthisius/girder,Xarthisius/girder