Follow up on CASSANDRA-6596

Add null check for sstableloader
Merge branch 'cassandra-2.0' into cassandra-2.1.0