=per #15671 fix local snapshot store picking up wrong file (Validation)

Forward port of #15702