Handle abort() properly in SSTableRewriter

Patch by marcuse; reviewed by jmckenzie for CASSANDRA-8320
Merge branch 'cassandra-2.1' into trunk

Conflicts:
	CHANGES.txt
	test/unit/org/apache/cassandra/io/sstable/SSTableRewriterTest.java