Merge remote-tracking branch 'origin/next'

diff --cc src/librbd/ImageCtx.cc
Simple merge

diff --cc src/librbd/ImageCtx.h
Simple merge

diff --cc src/librbd/internal.cc
Simple merge

diff --cc src/rbd.cc
Simple merge

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

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

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

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