Merge pull request #15294 from liewegas/wip-osd-tree

osd: 'osd tree in|out|up|down' to filter tree results

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

diff --cc qa/workunits/cephtool/test.sh
Simple merge

diff --cc src/mon/MonCommands.h
Simple merge

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

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

diff --cc src/osd/OSDMap.h
Simple merge