add license for javassist
update thrift-server license to 0.3.6
Expose CFMetaData#isDense()
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	src/java/org/apache/cassandra/config/CFMetaData.java
	src/java/org/apache/cassandra/cql3/statements/CreateTableStatement.java
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Ninja: adjusted cqlsh tests for CASSANDRA-7857
Merge branch 'cassandra-2.1' into trunk
Ninja: cqlsh test fixed for 2.1.0
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
fix changes
Attempt to fix intermittent failure of DeleteTest
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Fix test compilation
Merge branch 'cassandra-2.1' into trunk
Don't expose internal classes over JMX

Patch by marcuse; reviewed by slebresne for CASSANDRA-7879
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/tools/NodeProbe.java