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

(Muhammad Ehsan ul Haque via Hari Shreedharan)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk