Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Elasticsearch: Discontinue EOL version 7.4 support

Change-Id: I114c9047e8884b6d410b517517760a9ab8a51781
tree: 072a7c6b21e6d47f91fa95ea7bebfea46ecb1e16
  1. java/
  2. javatests/