Merge "Add 'id' to the server group cleanup list, not body"