Fix BatchlogManagerTest consistency

patch by Carl Yeksigian; reviewed by Michael Shuler for CASSANDRA-7397
Merge branch 'cassandra-2.0' into cassandra-2.1

Conflicts:
	test/unit/org/apache/cassandra/db/BatchlogManagerTest.java
Merge branch 'cassandra-2.1' into trunk