Fix TokenMetadataTest
remove unnecessary(and failing) test
Fix ScrubTest
Fix LeaveAndBootstrapTest
Fix potential ConcurrentModificationException in tests
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	test/unit/org/apache/cassandra/db/ScrubTest.java
	test/unit/org/apache/cassandra/service/LeaveAndBootstrapTest.java
change MIN_SANE_LIVE_RATIO logging to debug
patch by jbellis for CASSANDRA-5377
Merge branch 'cassandra-1.2' into cassandra-2.0
Bump Xss to 256k to match 2.0+ (CASSANDRA-5517)
Merge branch 'cassandra-1.2' into cassandra-2.0
Update versions, licenses for 1.2.12 release
close corrupt summary stream before trying to delete it
patch by Mikhail Stepura; reviewed by jbellis for CASSANDRA-6380
update pig example scripts
Patch by Jeremy Hanna, reviewed by brandonwilliams for CASSANDRA-6239
Fix FD leak on slice read path
patch by Graham Sanderson and jbellis; reviewed by slebresne and tested by mshuler for CASSANDRA-6275
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	build.xml
	debian/changelog
Optimize FD phi calculation
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6386
merge from 1.2
Improve initial FD phi estimate when starting up
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-6385
merge from 1.2
convert sum to double before dividing