Fix salvage merge

@michaelcahill, I think this is ready for your review & merge.