netty >= version 4.0 now has an artifact name of netty-all
Merge branch 'cassandra-2.1' into trunk