Merge remote-tracking branch 'upstream/pull/1121' into 1.4.x
Merge remote-tracking branch 'upstream/pull/1122' into 1.4.x
Merge remote-tracking branch 'upstream/pull/1123' into 1.4.x
v1.0.4 beta2 CHANGELOG
credit where credit is due
Merge pull request #1126 from kurtado/1.4.x-changelog

1.4.x changelog
clean trailing whitespace.
Merge pull request #1128 from miah/whitespace

clean trailing whitespace in elasticsearch output modules.
Merge remote-tracking branch 'upstream/master'