Merge branch 'master' into performance

Conflicts:
	util/options.cc

db/db_bench.cc

@@ -1327,7 +1327,7 @@ int main(int argc, char** argv) {
       FLAGS_disable_seek_compaction = n;
     } else if (sscanf(argv[i], "--delete_obsolete_files_period_micros=%ld%c",
                       &l, &junk) == 1) {
-      FLAGS_delete_obsolete_files_period_micros = n;
+      FLAGS_delete_obsolete_files_period_micros = l;
     } else if (sscanf(argv[i], "--stats_interval=%d%c", &n, &junk) == 1 &&
                n >= 0 && n < 2000000000) {
       FLAGS_stats_interval = n;

util/options.cc

@@ -96,6 +96,8 @@ Options::Dump(
         db_log_dir.c_str());
     Log(log,"                Options.disable_seek_compaction: %d",
         disable_seek_compaction);
+    Log(log,"    Options.delete_obsolete_files_period_micros: %ld",
+        delete_obsolete_files_period_micros);
     Log(log,"             Options.max_background_compactions: %d",
         max_background_compactions);
 }   // Options::Dump