Revert flush directory (CASSANDRA-6357)

Patch by Jonathan Ellis; reviewed by Benedict Elliott Smith
Merge branch 'cassandra-2.1' into trunk