Fix over-zealous dir deletion in BundleVol
Fix bundlevol <-> imagecreator arg mismatch

Fixes TOOLS-381