Add make_wrapped
Tidy up namespace usage in PrefilledReadStream
[FOLD] handshakedetector to use wrapped handler
[FOLD] handshake detector