Fix up some issues with database clustered timers
Merge pull request #6414 from stuartwdouglas/clustered-timers

Fix up some issues with database clustered timers