This is a follow up to CNV-21240 where it was suggested that we should be checking the contents of existing CRs during a restore. This requires some refactoring of the existing comparison code and isn't critical to landing CNV-21240 so has been broken out into this separate story.