Merge branch 'cassandra-1.1' into trunk

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
	src/java/org/apache/cassandra/service/StorageProxy.java
	src/java/org/apache/cassandra/service/WriteResponseHandler.java
Simplify and generalize startup message in binary protocol

patch by slebresne; reviewed by thepaul for CASSANDRA-4539
Adds events push to binary protocol

patch by slebresne; reviewed by thepaul for CASSANDRA-4480
Fix update of CF comparator

patch by slebresne; reviewed by jbellis for CASSANDRA-4493
change JdbcDate to return Types.TIMESTAMP
patch by Michael Krumpholz; reviewed by slebresne and jbellis for CASSANDRA-4628
Fix cql error with ORDER BY when using IN
patch by Pavel Yaskevich; reviewed by Sylvain Lebresne for CASSANDRA-4612
Bump stack to 180k.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-4631
Bump stack to 180k.
Patch by brandonwilliams reviewed by jbellis for CASSANDRA-4631
Merge branch 'cassandra-1.0' into cassandra-1.1
change ColumnSerializer.deserialize to be able fix timestamps from future, related to CASSANDRA-4561
Increase default max_hint_window_in_ms to 3h
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4632
Fix changelog
Multiple values for CurrentLocal Node ID

patch by slebresne; reviewed by jbellis for CASSANDRA-4626
Merge branch 'cassandra-1.0' into cassandra-1.1

Conflicts:
	CHANGES.txt
	src/java/org/apache/cassandra/db/SystemTable.java
explain how to work around exec problems in error message
patch by jbellis for CASSANDRA-4590
update guava to r13
remove unnecessary boxing
cleanup
add atomic_batch_mutate
patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-4542
gen-thrift-java