do not ignore user configured JAVA_HOME

Patch by eevans; reviewed by Michael Shuler for CASSANDRA-6131
Fix creating cellnameType for super columns
Ninja fix CFS.removeUnfinishedCompactionLeftovers()

ninja patch by Benedict Elliott Smith; ninja reviewed by Aleksey
Yeschenko
Fix dropping columns in trunk

patch by Mikhail Stepura; reviewed by Aleksey Yeschenko for
CASSANDRA-6520
Move *PropDefs to o.a.c.cql3.statements
Merge branch 'cassandra-2.0' into trunk
replace SnapTreeMap/AtomicSortedColumns with BTree/AtomicBTreeColumns
patch by Benedict Elliott Smith; reviewed by jbellis for CASSANDRA-6271
re-enable assertions by default
reorder imports
Add ability to throttle batchlog replay

patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
CASSANDRA-6550
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
Merge branch 'cassandra-2.0' into trunk

Conflicts:
	NEWS.txt
	src/java/org/apache/cassandra/db/BatchlogManager.java
RowIndexEntry.Serializer.skip is a static method, call it as such
Fix ClassCastException for super columns
merge