Merge pull request #6641 from jtattermusch/backport_csharp_to_14_2

Backport C# changes to 0.14 branch