Merge PR #61116 into main

* refs/pull/61116/head:

Reviewed-by: Venky Shankar <vshankar@redhat.com>
Reviewed-by: Patrick Donnelly <pdonnell@ibm.com>

diff --cc .mailmap
Simple merge

diff --cc .organizationmap
Simple merge

diff --cc src/client/Client.cc
Simple merge

diff --cc src/libcephfs.cc
Simple merge