vhd-tool update fallout

Forward port of some patches created when backporting the vhd-tool update and related changes.