Merge changes Ia17bcc86,I1954b38f

* changes:
  snapuserd: Remove IByteSink usage from legacy snapuserd.
  libsnapshot: Disable another legacy merge path in tests.