Better fix for #306171: Pass along criteria to location_save() to ensure that...

Better fix for #306171: Pass along criteria to location_save() to ensure that the lid conservation code doesn't reuse a lid tied to a single *other instance*.

This fixes a bug when making a change to a location when adding a revision.