Fixed a date bug in the trim_snapshots tests.
More comments about why we're choosing these timeframes.
Merge branch 'fix-ec2-snap-tests' into develop