Revert adding the key alias to the 2ndary indexes names (from 5378 patch)
Fix prepared BATCH statements with batch-level timestamps

patch by Aleksey Yeschenko; reviewed by Sylvain Lebresne for
CASSANDRA-5415
 Allow overriding superuser setup delay

 patch by Aleksey Yeschenko; reviewed by Jonathan Ellis for
 CASSANDRA-5430
Change version for 1.2.4 release
support username/password for for jmx in shuffle tool
patch by mmichalski reviewed by dbrosius for cassandra-5431
add 5431 to CHANGES.txt
Stop calling the binary proto spec a draft since we've released it
Include fatal errors in trace events
patch by jbellis; reviewed by aleksey for CASSANDRA-5447
Ensure that PerRowSecondaryIndex is notified of row-level deletes
patch by Sam Tunnicliffe; reviewed by jbellis for CASSANDRA-5445
Fix trying to load deleted row into row cache on startup
patch by jbellis; reviewed by dbrosius for CASSANDRA-4463
merge from 1.1
Allow empty blob literals in CQL3

patch by slebresne; reviewed by iamaleksey for CASSANDRA-5452
Fix streaming RangeTombstones at column index boundary; patch by slebresne reviewed by yukim for CASSANDRA-5418
Remove synchronization in long-running PCRS
Patch by Oleg Kibirev, reviewed by brandonwilliams for CASSANDRA-5456
Merge branch 'cassandra-1.1' into cassandra-1.2
CASSANDRA-5459: remove node from seeds when it completely leaves the cluster.
This version slightly refactors Gossiper by pulling th seeds list building code
out of start() and into a shared method that removeEndpoint() will call.
Also, reload the seeds list, then remove the dead node.
Remove node from seeds list when it permanently leaves the cluster
patch by jasobrown; freviewed by driftx for CASSANDRA-5459.
make constant, static
minor removal of dead code
patch by dbrosius reviewed by jbellis for CASSANDRA-5463
Merge branch 'cassandra-1.1' into cassandra-1.2