FLUME-2441. HTTP Source Unit tests fail on IBM JDK 7

(Li Xiang via Hari)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk