Upgrade to netty-build-16