Merge changes Ibffdd9c9,Ief5a16d1

* changes:
  libsnapshot: Add a test case for unexpected snapshots during data resets.
  libfiemap: Add some dependency injection.