Merge PR #27070 into master

* refs/pull/27070/head:
	osd/OSDMap: add 'zone' to default crush map

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

diff --cc src/test/crush/crush-choose-args-expected-one-more-3.txt
Simple merge