Merge "Delete a cg-snapshot following updated volumes"