Scheduling improvements (and fixing tests)
fix apiviz
updated to 2.4.0.Final version
changing it to 2.5.0 Snapshot

This reverts commit b22ca1f9c9f675604fea86d366f74f69996d2b95.