Fix Volume.{clone,snapshot}

When we rename the node to make a base image, one of our leaves
must have the same name as the original (not a mangled version
of it)

Signed-off-by: David Scott <dave.scott@eu.citrix.com>