Merge changes I875067c9,I0bb0fdc9

* changes:
  libsnapshot: Fix artifact cleanup.
  libsnapshot: Unify vts_libsnapshot_test harness.