Merge pull request #12166 from liewegas/wip-osdmap-encoding

osd: condition OSDMap encoding on features

Reviewed-by: Samuel Just <sjust@redhat.com>

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/osd_types.cc
Simple merge

diff --cc src/tools/ceph_monstore_tool.cc
Simple merge

diff --cc src/tools/crushtool.cc
Simple merge

diff --cc src/tools/osdmaptool.cc
Simple merge