[#1648] Make sure trailing headers are not dropped during content encoding/decoding
Merge remote-tracking branch upstream/$:{upbranch}