[#1933] Correctly add the wsencoder before the httpencoder as the httpencoder also handle ByteBuf
[#1936] Fix example in javadoc
Merge remote-tracking branch: upstream/master