merged cassandra-2.1 to trunk (for CASSANDRA-7033)