Merge branch 'wip-swift-manifest'

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

diff --cc src/rgw/rgw_common.cc
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_rados.cc
Simple merge

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