merge conflict fixes for Revit2014 from master
more fixes for merge conflict and build failures