FLUME-2505: Test added in FLUME-2502 is flaky

(Hari Shreedharan via Jarek Jarcec Cecho)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk