Merge "ConfirmVolumeGroupNameTest improvements"