Fix assertion encountered when using heap_buffers

Patch by tjake; reviewed be belliottsmitch for CASSANDRA-7862
Merge branch 'cassandra-2.1' into trunk
use correct native port in pig-test
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Make repair no-op when RF=1

patch by yukim; reviewed by krummas for CASSANDRA-7864
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Add cqlsh DESCRIBE support for frozen UDTs, tuples

Patch by Tyler Hobbs; reviewed by Aleksey Yeschenko for CASSANDRA-7863
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
bump thrift-server version to 0.3.7 to properly shutdown invocation pool shutdown
patch by Pavel Yaskevich; tested by Philip Thompson for CASSANDRA-7594
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	build.xml
Merge branch 'cassandra-2.0' into cassandra-2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
update thrift-server license file
simplify/avoid possible npes