Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/gms/Gossiper.java
Fix logback config in scripts and packaging.
Patch by Michael Shuler, reviewed by brandonwilliams for CASSANDRA-6530
Ninja fix simple bugs from #6438
refactor nodetool, encapsulating each command into a subclass
patch by Clément Lardeur; reviewed by Mikhail Stepura for CASSANDRA-6381
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
add airline and javax.inject jars
update nodetool.bat for #6381
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Merge branch 'cassandra-2.0' into trunk
Merge branch 'cassandra-2.0' into trunk
don't stop a native server that doesn't exist
Fix shutdown slowness in multithreaded CL.
Patch by Benedict Elliot Smith, reviewed by brandonwilliams for
CASSANDRA-6578
Fixup for 6271