merge -r 788583 from 2.1.x branch [MNG-4189] o compare the file's timestamp and size instead of using the resolved flag when resolving snapshots (fix by Benjamin Bentmann) o added unit test