Merge remote-tracking branch 'origin/master' into wip-3206

diff --cc src/Makefile.am
Simple merge

diff --cc src/common/config_opts.h
index 07149bef07921fb52818cab357df46663960a632,0ef76e5af3cb0a57d27d25e2955963d105461c23..a691ee4e67771f0d1f64092a5afab3a61aaa42ab
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -449,8 -454,9 +454,10 @@@ OPTION(rgw_gc_max_objs, OPT_INT, 32
  OPTION(rgw_gc_obj_min_wait, OPT_INT, 2 * 3600)    // wait time before object may be handled by gc
  OPTION(rgw_gc_processor_max_time, OPT_INT, 3600)  // total run time for a single gc processor work
  OPTION(rgw_gc_processor_period, OPT_INT, 3600)  // gc processor cycle time
 +OPTION(rgw_resolve_cname, OPT_BOOL, false)  // should rgw try to resolve hostname as a dns cname record
  
+ OPTION(mutex_perf_counter, OPT_BOOL, false) // enable/disable mutex perf counter
+ 
  // This will be set to true when it is safe to start threads.
  // Once it is true, it will never change.
  OPTION(internal_safe_to_start_threads, OPT_BOOL, false)