FLUME-2309. Spooling directory should not always consume the oldest file first.

(Muhammad Ehsan ul Haque via Hari Shreedharan)
Merge branch 'upstream-flume-1.5' into flume-1.5