Merge pull request #15002 from dachary/wip-19836-crush-pre-luminous

crush: encode can override weights with weight set

Reviewed-by: Sage Weil <sage@redhat.com>

diff --cc src/crush/CrushWrapper.cc
Simple merge

diff --cc src/crush/CrushWrapper.h
Simple merge

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

diff --cc src/test/crush/CrushWrapper.cc
Simple merge