Remove ability to change num_tokens once set.

Patch by brandonwilliams, reviewed by thobbs for CASSANDRA-7649
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Ninja: remove buggy test assertion from 2.1

This was fixed by CASSANDRA-7390, but that fix starts with Cassandra
3.0.
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix typo in v3 native protocol spec

Patch by Robert Stupp; review by Tyler Hobbs for CASSANDRA-7652
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Track min/max timestamps for range tombstones.

Patch by marcuse; reviewed by iamaleksey for CASSANDRA-7647
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
fix merge
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Avoid NPE when listing saved caches directory

Patch by marcuse; reviewed by yukim for CASSANDRA-7632
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix tracing on the new SEPExecutor
patch by jbellis; reviewed by bes for CASSANDRA-7644
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Filter cached results correctly.

Patch by marcuse, reviewed aleksey for CASSANDRA-7636
Merge branch 'cassandra-2.1.0' into cassandra-2.1
remove shuffle bat