Improve nodetool cleanup/scrub/upgradesstables failure handling.

Patch by marcuse, reviewed by jbellis for CASSANDRA-6774
Merge branch 'cassandra-2.1' into trunk