Merge "Bump netty to 4.0.30"