Merge changes I1dc28606,I4d77c435

* changes:
  libsnapshot:VABC: Allow batch merge
  libsnaphot: Refactor cow_snapuserd test