=per #15671 fix local snapshot store picking up wrong file.

Added spec test to cover fix. To be reviewed by @ktoro