Allow faster shutdown of dir polls.
Currently, if there are multiple dir polls deployed, Q2 shutdown takes upto 60 seconds for each of them to shutdown. With 4 dir polls deployed, the typical time for a shutdown is > 4 mins. This change makes the shutdown much faster.
Merge remote-tracking branch 'upstream/master'
Revert whitespace changes due to smart editor
Merge pull request #70 from vishnupillai/master

Allow faster shutdown of dir polls