Bump Xss to 256k to match 2.0+ (CASSANDRA-5517)
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge branch 'cassandra-2.0' into trunk