Make corrections for CASSANDRA-6974
Correct typo
Remove all snapshot dirs
Move cleanup into finally block
Merge pull request #87 from riptano/fix_7846

Make corrections for CASSANDRA-6974