(20979) normalize how snapshots are determined, remove hardcoded snapshot name assumptions
Merge pull request #466 from anodelman/cleanup-snaps

(20979) fix how snapshots are determined, remove hardcoded snapshot names