Merge pull request dotnet/extensions#2696 from dotnet-maestro-bot/merge/release/2.1-to-release/2.2

[automated] Merge branch 'release/2.1' => 'release/2.2'\n\nCommit migrated from dotnet/extensions@9e2c44b

Author: wtgodbe