add a -no-snapshot option to scrub to be able to run in tight disk space scenarios
patch by ltodorov reviewed by dbrosius for cassandra-5891
Merge branch 'cassandra-1.2' into cassandra-2.0.0
Merge branch 'cassandra-2.0.0' into cassandra-2.0