another patch for 10.9, although not needed on my machine
Merge branch 'release/1.1'

Conflicts:
	src/backend/avro/AvroCpp/api/NodeImpl.hh
	src/backend/avro/AvroCpp/impl/FileStream.cc