do not ignore user configured JAVA_HOME

Patch by eevans; reviewed by Michael Shuler for CASSANDRA-6131
Move *PropDefs to o.a.c.cql3.statements
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
Verify that the keyspace exists in describeRing and print nicer error message in BulkLoader.

Patch by marcuse, reviewed by thobbs for CASSANDRA-6529
Allow specifying custom secondary index options in CQL3

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-6480
Fix execution of LOCAL_QUORUM queries with SimpleStrategy

patch by alexliu68; reviewed by slebresne for CASSANDRA-6545
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/db/ConsistencyLevel.java
Wait for gossip to settle before accepting client connections
patch by Chris Burroughs; reviewed by Tyler Hobbs and jbellis for CASSANDRA-4288
1.2 nodes show 2.0 nodes as up when upgrading.
Patch by brandonwilliams, reviewed by Tyler Hobbs for CASSANDRA-6554
Don't update system table for unknown nodes/dead states
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6053
Merge branch 'cassandra-1.2' into cassandra-2.0
Don't update system table for unknown nodes/dead states
Patch by Tyler Hobbs, reviewed by brandonwilliams for CASSANDRA-6053
make isDeadState public
Merge branch 'cassandra-1.2' into cassandra-2.0
fix tests
fix tests
Revert "fix tests"

This reverts commit fbd51b77a047f2a04a94c4b474881c2be9bf1171.
update thrift-server to version 0.3.3 to fix CASSANDRA-6373 and CASSANDRA-6407
make log parms/markers the same