Correctly remove tmplink files

Patch by marcuse; reviewed by benedict for CASSANDRA-7803
Merge branch 'cassandra-2.1.0' into cassandra-2.1