(#2477) - use a Map and Set instead of an object when we have user supplied values
(#2477) - fix reserved ids in revsDiff