Merge remote-tracking branch 'upstream/wip_lost_unfound_event'

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

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

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

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