Follow-up to CASSANDRA-5052
Merge branch 'cassandra-1.1' into cassandra-1.2