Merge remote-tracking branch 'gh/wip-objecter-full-2'

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

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

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

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

diff --cc src/osdc/Objecter.cc
Simple merge

diff --cc src/rbd.cc
Simple merge