Merge changes I8cdadbf9,I11aa7bac into main

* changes:
  RecoverySnapshotStorage: silence log spam from file not found
  RecoverySnapshotStorage: fold readFromDisk() and writeFromDisk() into callers