Fix NPE in FileCacheService.sizeInBytes

patch by tjake; reviewed by jbellis for (CASSANDRA-7756)
Merge branch 'cassandra-2.0' into cassandra-2.1.0

Conflicts:
	CHANGES.txt
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Fix sstableloader unable to connect encrypted node

patch by yukim; reviewed by krummas for CASSANDRA-7585
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/io/util/RandomAccessReader.java
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	src/java/org/apache/cassandra/config/YamlConfigurationLoader.java
	src/java/org/apache/cassandra/io/sstable/SSTableLoader.java
	src/java/org/apache/cassandra/streaming/ConnectionHandler.java
	src/java/org/apache/cassandra/streaming/StreamPlan.java
	src/java/org/apache/cassandra/streaming/StreamResultFuture.java
	src/java/org/apache/cassandra/streaming/StreamSession.java
	src/java/org/apache/cassandra/tools/BulkLoader.java
	test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java
Merge branch 'cassandra-2.1' into trunk
fix build
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Invalidate all caches on table drop

patch by Aleksey Yeschenko; reviewed by Benedict Elliott Smith for
CASSANDRA-7561
Merge branch 'cassandra-2.1.0' into cassandra-2.1
Merge branch 'cassandra-2.1' into trunk
Handle CQL row marker in SSTableImport

patch by Mikhail Stepura; reviewed by Tyler Hobbs for CASSANDRA-7477
Merge branch 'cassandra-2.1.0' into cassandra-2.1

Conflicts:
	test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/tools/SSTableImportTest.java
Add max live/tombstoned cells to nodetool cfstats output

patch by Robert Stupp; reviewed by Jeremiah Jordan for CASSANDRA-7731
Merge branch 'cassandra-2.1' into trunk
Avoid flushing on request threads. causes netty to over cache buffers and OOM

patch by benedict; reviewed by tjake for (CASSANDRA-7743)
Merge branch 'cassandra-2.1.0' into cassandra-2.1