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

[dotnet-maestro-bot]

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

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

• @HaoK

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.2-to-master master
git pull https://github.com/dotnet-maestro-bot/Identity merge/release/2.2-to-master
git checkout master
git merge --no-ff merge/release/2.2-to-master
git push origin master

Instructions for resolving conflicts

⚠️ 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.2-to-master'. 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.2-to-master master
git pull https://github.com/dotnet-maestro-bot/Identity merge/release/2.2-to-master
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet-maestro-bot/Identity merge/release/2.2-to-master

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.

[Eilon]

@HaoK - please merge ASAP.

[dotnet-maestro-bot]

This pull request has been updated.

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

• @javiercn
• @HaoK

[HaoK]

@javiercn I guess I should let you do this merge now since you have way more changes, I don't think mine should cause any conflicts, let me know if you have any issues

[javiercn]

I resolved the conflict, I'll merge once the build passes

[javiercn]

Superseeded by #2047