Merge pull request #10647 from dachary/wip-16593-jewel

jewel: FAILED assert(object_no < m_object_map.size())

Reviewed-by: Jason Dillaman <dillaman@redhat.com>

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

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

diff --cc src/librbd/operation/TrimRequest.cc
Simple merge

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