Make sure both type name are prepared for a type rename
encapsulate SecondaryIndex.estimateResultRows
patch by Miguel Angel Fernandez Diaz; reviewed by Sam Tunnicliffe for CASSANDRA-6498
fix build
use junit assertions
Refuse snapshots during bootstrap.
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-6585
Merge branch 'cassandra-1.2' into cassandra-2.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into trunk
Make TOKENS the canonical place to determine tokens.
Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-5131