Merge remote-tracking branch 'gh/last'

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

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

diff --cc src/os/HashIndex.cc
Simple merge

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

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

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