Merge pull request #6171
bdcf5de Fix intermittent hang issue in scheduler_tests (Wladimir J. van der Laan)