Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Elasticsearch: Unharcode localhost for container's

Change-Id: Id798846df3bc48b4266cec545b2ad607a1a4a06b
tree: ca494ce7ed054736ab66ef2930c6a2c8eb973b92
  1. java/
  2. javatests/