Add back Netty 3 jar to stress lib dir for #6911
Merge branch 'cassandra-2.1' into trunk