e36c1436b8
Motivation: While forward porting https://github.com/netty/netty/pull/3579 there were a few areas that had not been previously back ported. Modifications: Backport the missed areas to ensure consistency. Result: More consistent 4.1 and master branches.