Merge PR #21934 into master

* refs/pull/21934/head:
	qa/standalone/mon/misc: fix features test
	qa/workunits: osd require-osd-release mimic -> nautilus
	test/cli/monmaptool/feature-set-unset: fix unknown ids
	test/cli/monmaptool: fix test
	osd/OSDMap: make NAUTILUS feature bit significant
	mon: add initial NAUTILUS feature/compatset bits

Reviewed-by: Kefu Chai <kchai@redhat.com>

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