FLUME-2381: Upgrade Hadoop version in Hadoop 2 profile to 2.4.0

(Hari Shreedharan via Jarek Jarcec Cecho)
FLUME-2368. Update CHANGELOG for 1.5 release
Merge remote-tracking branch 'remotes/origin/trunk' into trunk