Merge pull request #13683 from liewegas/wip-crush-rulesets

crush: detect and (usually) fix ruleset != rule id

Reviewed-by: Loic Dachary <ldachary@redhat.com>

diff --cc PendingReleaseNotes
Simple merge

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

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

diff --cc src/test/osd/TestOSDMap.cc
Simple merge