[WIP] Spark 1121/avro dep fix

Dummy pr to let jenkins run.