Merge pull request #10030 from gilles-peskine-arm/tls-defragment-incremental-3.6

Backport 3.6: Incremental TLS handshake defragmentation