FLUME-2425 - FileChannel should trim data and checkpoint directories (Johny Rufus via Brock Noland)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk