FLUME-2533: HTTPS tests fail on Java 6

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