Fix forceBlockingFlush behavior

patch by krummas; reviewed by slebresne for CASSANDRA-5241
Merge branch 'cassandra-1.2' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/ColumnFamilyStore.java