Merge remote-tracking branch 'origin/jewel'

diff --cc src/client/Client.cc
Simple merge

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

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

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

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