Fixes to make BuildAndPush work with newer version of hadoop/avro