Fix potential leak in HttpContentEncoder
Merge remote-tracking branch upstream/$:{upbranch}