Merge branch 'rgw-restore-wait-timeout' of https://github.com/mheler/ceph into wip...

diff --cc src/common/options/rgw.yaml.in
Simple merge

diff --cc src/rgw/CMakeLists.txt
Simple merge

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

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

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