FLUME-1793. Unit test TestElasticSearchLogStashEventSerializer fails with IBM JDK

(Li Xiang via Hari Shreedharan. Reviewed by Edward Sargisson)
Merge remote-tracking branch 'remotes/origin/trunk' into trunk