Merge "Add missing addCleanup of _delete_group_snapshot"