[vs17.10] Merge v17.10.46 into vs17.10#12647

rainersigwald merged 2 commits intodotnet:vs17.10dotnet/msbuild:vs17.10from

JanProvaznik:merge-v17.10.46-to-vs17.10JanProvaznik/msbuild:merge-v17.10.46-to-vs17.10Copy head branch name to clipboard