Code clean
OFC-1178 When deleting a survey object, detach it correctly from the
survey
OFC-1179 CodeList and CodeListItem versioning attributes not stored
correctly