Add --resolve-ip option to 'nodetool ring'

patch by Yasuharu Goto; revised by Mikhail Stepura for CASSANDRA-7210
Merge branch 'cassandra-2.0' into cassandra-2.1
Backported CASSANDRA-5818 to cassandra-2.0

patch by Lyuben Todorov; reviewed by Mikhail Stepura
Merge branch 'cassandra-2.0' into cassandra-2.1
Limit user types to the keyspace they are defined in

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6643
reduce garbage on codec flag deserialization

patch by belliottsmith reviewed by dbrosius for cassandra-7244
Merge branch 'cassandra-2.0' into cassandra-2.1
Improve javadoc for KeysIndex

patch by plin reviewed by dbrosius for cassandra-7253
Merge branch 'cassandra-2.0' into cassandra-2.1
allow num_tokens to be unspecified, as described in the yaml
Merge branch 'cassandra-2.0' into cassandra-2.1
Fixup for CASSANDRA-6914: null handling, ...

patch by slebresne; reviewed by thobbs for CASSANDRA-7155
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/cql3/ColumnCondition.java
	src/java/org/apache/cassandra/cql3/statements/CQL3CasConditions.java
	src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java
	src/java/org/apache/cassandra/cql3/statements/SelectStatement.java
	src/java/org/apache/cassandra/cql3/statements/Selection.java
	src/java/org/apache/cassandra/db/marshal/CollectionType.java
	src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
	src/java/org/apache/cassandra/db/marshal/ListType.java
	src/java/org/apache/cassandra/db/marshal/MapType.java
	src/java/org/apache/cassandra/db/marshal/SetType.java
	src/java/org/apache/cassandra/serializers/CollectionSerializer.java
	src/java/org/apache/cassandra/serializers/ListSerializer.java
	src/java/org/apache/cassandra/serializers/MapSerializer.java
	src/java/org/apache/cassandra/serializers/SetSerializer.java
	test/unit/org/apache/cassandra/db/marshal/CollectionTypeTest.java
Validate method for CollectionType

patch by slebresne; reviewed by thobbs for CASSANDRA-7208
Changelog fix
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Increase compaction visibility

Patch by cnlwsu; reviewed by marcuse for CASSANDRA-7242.
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/metrics/ColumnFamilyMetrics.java
Provide the correct QueryOptions when buildind CAS resultset
Always reallocate buffers with HSHA.

Patch by brandonwilliams, reviewed by Rick Branson for CASSANDRA-6285