Merge pull request #3057 from ceph/wip-crush-straw

crush: fix straw bucket scaler bugs

Reviewed-by: Greg Farnum <gfarnum@redhat.com>

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

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

diff --cc src/crush/builder.c
Simple merge

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

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

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