FLUME-2181 - Optionally disable File Channel fsyncs (Hari via Brock)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk