Upgrade Netty 3.6.4.Final, backport #1069