Fixed ERRAI-534: Removed dependency to Netty 3.2.7
Merge branch '2.4'