AGPUSH-96 "Upgrade to latest Netty 4 version"
Merge branch 'danbev-AGPUSH-96-upgrade-netty'