Merge change I93fe0d1b

* changes:
  Re-enable SSL handshake cutthrough support (and fixed unittest)