[automated] Merge branch 'release/2.1' => 'release/2.2'

[dotnet-maestro-bot]

I detected changes in the release/2.1 branch which have not been merged yet to release/2.2. I'm a robot and am configured to help you automatically keep release/2.2 up to date, so I've opened this PR.

This PR merges commits made on release/2.1 by the following committers:

• @natemcmaster

Instructions for merging

This PR will not be auto-merged. When pull request checks pass, please complete this PR by creating a merge commit, not a squash or rebase commit.

You can also do this on command line:

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/MetaPackages merge/release/2.1-to-release/2.2
git checkout release/2.2
git merge --no-ff merge/release/2.1-to-release/2.2
git push origin release/2.2

Instructions for resolving conflicts

:warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/2.1-to-release/2.2'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/2.1-to-release/2.2 release/2.2
git pull https://github.com/dotnet-maestro-bot/MetaPackages merge/release/2.1-to-release/2.2
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/MetaPackages merge/release/2.1-to-release/2.2

Please contact .NET Core Engineering if you have questions or issues. Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.

[natemcmaster]

We don't need to bring forward version-only changes at this time.