Fix test failing for clearing commit log directory
Merge branch 'cassandra-2.1' into trunk