Prevent engine reset during shut down sequence
Merge pull request #3053 from Benglin/Revit2015

Cross merging master changes into Revit 2015