update netty-all license
Merge branch 'cassandra-2.1' into trunk
fix logging context
Merge branch 'cassandra-2.1' into trunk
Reduce likelihood of contention on local paxos state locking

Patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for CASSANDRA-7359
Merge branch 'cassandra-2.1' into trunk
CASSANDRA-7359 CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
suggest cassandra-tools package
Merge branch 'cassandra-2.1' into trunk