Merge in 'release/2.2' changes

\n\nCommit migrated from 1ece20b861
This commit is contained in:
dotnet-bot 2019-04-22 18:19:21 +00:00
commit bc84e78cba

Diff Content Not Available