Final revision to zone rebuild code
Changed ZoneVolume to use new ZoneVolumeMapper