Add support for merging volumes.
Discard branch 'merge-support'

This code doesn't work with thin snapshots, so we now use rsync.