Merge branch 'stable-3.3' into stable-3.4

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

Change-Id: I5d5669898d56e977ec6a00b2766b66ecfa773bb5
tree: b1396d2e6803c71ca5839fe2863bee931df36030
  1. java/
  2. javatests/