Merge PR #28589 into nautilus

* refs/pull/28589/head:
	msg/async/ProtocolV[12]: add ms_learn_addr_from_peer

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/common/legacy_config_opts.h
Simple merge

diff --cc src/common/options.cc
Simple merge

diff --cc src/msg/async/ProtocolV1.cc
Simple merge

diff --cc src/msg/async/ProtocolV2.cc
Simple merge