Simplify querying for timeouts, and introduce cleaning-up abilities to guarantee we don't skip any timeouts, fixes #2133

Re-enabling tests that should have NEVER been disabled

Minimizing the wait time for nextTimeToQuery timeouts

Optimization

Added back the loop that keeps querying for more results.

Otherwise we could skip results that are suppose to trigger at the same time because the startSlice uses greater then logic.

Double assignment not needed
Merge branch 'hotfix-4.0.6' into support-4.0