Merge pull request #1 from ricojansen/master

DGM-60 Fix for the delay queue
Merge pull request #2 from ricojansen/master

DGM-64 Queue per index and classname refactoring.
Small cleanup.