Merge branch 'master' into columnfamilies

Conflicts:
	db/compaction_picker.cc
	db/compaction_picker.h
	db/db_impl.cc
	db/version_set.cc
	db/version_set.h
	include/rocksdb/options.h
	util/options.cc

include/rocksdb/options.h

@@ -24,6 +24,7 @@ class CompactionFilter;
 class CompactionFilterFactory;
 class Comparator;
 class Env;
+enum InfoLogLevel : unsigned char;
 class FilterPolicy;
 class Logger;
 class MergeOperator;
@@ -532,6 +533,8 @@ struct DBOptions {
   // Default: nullptr
   shared_ptr<Logger> info_log;
 
+  InfoLogLevel info_log_level;
+
   // Number of open files that can be used by the DB.  You may need to
   // increase this if your database has a large working set. Value -1 means
   // files opened are always kept open. You can estimate number of files based