Followup to CASSANDRA-6916 - only close bf if we have not opened early.

Patch by benedict; reviewed by marcuse for CASSANDRA-6916.
Merge branch 'cassandra-2.1' into trunk