Merge pull request #2681 from Benglin/Revit2015

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

This reverts commit ed8209984190a253fc169142fd5f4b120c20d2f5.