Merge pull request #2680 from Benglin/master

Fixed failures in DynamoCoreUITests
Revert "Enabled scheduler, disabled two cancellation related tests"

This reverts commit df78f070738163c33fb81e7282d06eeca28b8f30.