Merge branch 'wip-rgw-multithreaded'

diff --cc src/common/config.cc
Simple merge

diff --cc src/rgw/rgw_common.h
Simple merge

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_op.h
Simple merge

diff --cc src/rgw/rgw_rest.cc
Simple merge

diff --cc src/rgw/rgw_rest.h
Simple merge

diff --cc src/rgw/rgw_rest_os.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge