[vs17.11] Merge v17.11.48 into vs17.11#12648

JanProvaznik merged 2 commits intodotnet:vs17.11dotnet/msbuild:vs17.11from

JanProvaznik:merge-v17.11.48-to-vs17.11JanProvaznik/msbuild:merge-v17.11.48-to-vs17.11Copy head branch name to clipboard