Remove field 'key' from model and usages in test
part 2 of renaming field to 'client_id', before we do the final migration to remove the 'key' field ENT-3293
part 2 of renaming field to 'client_id', before we do the final migration to remove the 'key' field ENT-3293