forward-port avro version change from master