Fix SSTableImportTest

patch by blerer; reviewed by azotcsit for CASSANDRA-8181
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	test/unit/org/apache/cassandra/tools/SSTableImportTest.java