Error when using hsha w/ unlimited rpc_max_threads

Patch by Tyler Hobbs; reviewed by Mike Adamson for CASSANDRA-8116
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/config/DatabaseDescriptor.java