FLUME-2488: TestElasticSearchRestClient fails on Oracle JDK 8

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