Merge "added in fix to use old volume group name for"