EXP-274. Fix modeling for new Avro API introduced by EXP-222

review: https://review.kiji.org/r/1325
issue: https://jira.kiji.org/EXP-274