Merge "Revert "snapuserd: Add unit test for test merge code path""