Clean shutdown when file processing is in progress
Reverting whitespace changes
Merge remote-tracking branch 'upstream/master'
Reverting whitespace changes
synchronizing on dirPoll
Interrupt thread is unable to do a clean join
synchronizing on dirPoll and fix test