FLUME-2408. Remove FLUME-1899 from CHANGELOG.
Merge remote-tracking branch 'remotes/origin/trunk' into trunk