fix CliTest on Windows
patch by Josh McKenzie; reviewed by jbellis for CASSANDRA-7194
Merge branch 'cassandra-2.1' into trunk