CDK-542: Fixed Avro 1.7.4 incomaptabilities in DataModelUtil