Enabled scheduler, disabled two cancellation related tests
Merge pull request #2675 from Benglin/master

Enabled scheduler, disabled two cancellation related tests
Merge remote-tracking branch 'origin/master' into SolarRadiation