Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  Set version to 3.1.12-SNAPSHOT
  Set version to 3.1.11
  Fix httpcore dependency needed by httpclient
  Revert "Add support for Elasticsearch version 7.9.*"
  Revert "Add support for Elasticsearch version 7.10.*"

Change-Id: I333a2434d66df525aa85687d9cc0134e7a398c21
tree: fa6a667e0ee7668105eacc037f305a480264799b
  1. java/
  2. javatests/