Increase socket bind backlog to 500
Patch by Oleg Anastasyev, reviewed by brandonwilliams for CASSANDRA-7236
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix heap size on Windows 32bit VM
patch by Joshua McKenzie; tested by Philip Thompson for CASSANDRA-7353
Merge branch 'cassandra-2.1' into trunk
add file:/// on Windows to -Dcassandra.config value
patch by Marco Tulio Avila Cerón; reviewed by Lyuben Todorov for CASSANDRA-7398
Merge branch 'cassandra-2.1' into trunk
Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	CHANGES.txt
Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
Clean up gossiper fully after shadow round.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7318
nodetool doesn't error when ~/.cassandra is inaccessible

Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6449
Merge branch 'cassandra-2.0' into cassandra-2.1
nodetool doesn't error when ~/.cassandra is inaccessible

Patch by Kirk True, reviewed by brandonwilliams for CASSANDRA-6449
Merge branch 'cassandra-2.1' into trunk
rm accidental file
Merge branch 'cassandra-2.1' into trunk
Upgrade to snappy 1.0.5.1

Patch by Iheanyi Ekechukwu, reviewed by brandonwilliams for
CASSANDRA-7381
Merge branch 'cassandra-2.1' into trunk
Fix BatchlogManagerTest consistency

patch by Carl Yeksigian; reviewed by Michael Shuler for CASSANDRA-7397