Include the target UUID in the checkpoint, too

This is necessary to ensure that we only fast-forward on replacement
when appropriate.

BugzID: 21973
BugzID: 22698