Merge pull request #3708 from akallabeth/termination_fixes
authorBernhard Miklautz <bmiklautz@users.noreply.github.com>
Mon, 23 Jan 2017 14:47:39 +0000 (15:47 +0100)
committerGitHub <noreply@github.com>
Mon, 23 Jan 2017 14:47:39 +0000 (15:47 +0100)
Client channel shutdown fixes


Trivial merge