Merge pull request #2673 from Benglin/Revit2015

Cross merging master changes into Revit 2015
Enabled scheduler, disabled two cancellation related tests