netty4 fixes
Merge pull request #433 from patriot1burke/master

netty4 fixes