Merge pull request #5247 from radical/pick-msbuild-fix-trigger-wrench