Initial rough pass at Netty 4 upgrade
Initial rough pass at Netty 4 upgrade