Merge pull request #3729 from ntherning/fix-failures-in-msbuild-tests-on-windows