Default flush dir to data dir.
Patch by brandonwilliams, reviewed by yukim for CASSANDRA-7064
Merge branch 'cassandra-2.1' into trunk