Fix sstableloader NPE

patch by benedict; reviewed by yukim for CASSANDRA7015
Merge branch 'cassandra-2.1' into trunk