r/m unused code from ThriftServer/TServerFactory
patch by Ed Capriolo; reviewed by jbellis for CASSANDRA-6854
Merge branch 'cassandra-2.1' into trunk
ByteBuffer write() methods for serializing sstables

Patch by benedict, reviewed by marcuse for CASSANDRA-6781
Merge branch 'cassandra-2.1' into trunk
comment CqlRow for #6807
Merge branch 'cassandra-1.2' into cassandra-2.0
Merge remote-tracking branch 'origin/cassandra-2.1' into cassandra-2.1
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge remote-tracking branch 'origin/trunk' into trunk
Merge branch 'cassandra-2.1' into trunk
Add proper compare function for CollectionType (for UDT sake)

patch by slebresne; reviewed by thobbs for CASSANDRA-6783
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1' into trunk
Remove unused import
CASSANDRA-6876 follow-up
Merge branch 'cassandra-2.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Update native server to Netty 4

patch by benedict; reviewed by slebresne for CASSANDRA-6236
Merge branch 'cassandra-2.1' of https://git-wip-us.apache.org/repos/asf/cassandra into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk