Merge pull request #886 from ceph/wip-6922

Fix some pg_num change return codes and make them more resistant to mis-use

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

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

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