Upgrade netty to 4.0.20
Merge branch 'cassandra-2.1' into trunk