fixing deadlock on scheduling test
2.4.0.Final release ...  During the tag process we had a few retags (this is the 3rd) due to a few test fixes.

This reverts commit ca1b4964d906c2cbe65d0680912283cd6d38a068.
Back to 2.5.0.Final

This reverts commit 42aba93be684e4b3e93266099f6ffb1595749b8a.