Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Elasticsearch V6: Add include_type_name to index requests

Change-Id: I9c3606af844adffe76e7292e56a8fa8b8acc99d6
tree: 77714b68c0b05144f2e812e4a9b97b16e2c629c0
  1. java/
  2. javatests/