Checkout
Marcel Reutegger
committed
on 24 Jul
OAK-7956: Conflict may leave behind _collisions entry

Merge revisions 1848729 and 1848769 from trunk