add airline and javax.inject jars
update nodetool.bat for #6381
Avoid StackOverflow with large IN queries

patch by slebresne; reviewed by jbellis for CASSANDRA-6567
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
fix bad merge
Merge branch 'cassandra-2.0' into trunk
Mark EPS as dead before sending echo command.
Patch by Sankalp Kohli, reviewed by brandonwilliams for CASSANDRA-6571
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
Remove dead code

patch by slebresne; reviewed by jbellis for CASSANDRA-6580
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/AtomicSortedColumns.java
Fix previous merge
Use LOCAL_QUORUM for LWT operations at LOCAL_SERIAL
patch by Sankalp Kohli; reviewed by jbellis for CASSANDRA-6495
Merge branch 'cassandra-2.0' into trunk
Remove time penalty from DES.
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6465
Merge branch 'cassandra-2.0' into trunk
Don't shutdown a nonexistant native server on 1.2, either.