Update Avro code gen to not mark fields as deprecated.
Fix bad merges for code style cleanup