FIXUP "OSD: Juggle the locking when resurrecting a PG"
FIXUP "msgr: change the delay queue flushing semantics"