Follow up to fix changesets with duplicate ids - TRUNK-4137