Import s2_pkt.c wbuf fixes from OpenSSL_0_9_6-stable branch.