FLUME-2278. Incorrect documentation for write-timeout of File Channel

(Satoshi Iijima via Roshan Naik)
Merge remote-tracking branch 'origin/trunk' into trunk