Merge remote-tracking branch 'origin/wip-bi-sharding-3'

diff --cc src/common/config_opts.h
Simple merge

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

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

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

diff --cc src/test/Makefile.am
Simple merge