Merge pull request #4239 from yuyuyu101/wip-librbd-conf

Wip librbd conf

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

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

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

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

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

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

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

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

diff --cc src/test/librbd/test_ImageWatcher.cc
Simple merge

diff --cc src/test/librbd/test_internal.cc
Simple merge