
This is a cherry-pick of stable-2.15 recently merged commit fc31842
.
This pick assumes that Elasticsearch 6.x.y is still also maintained for
the stable-2.14 branch.
Version 6.4.2 is the latest release on the 6.4.x series.
Change-Id: I615aa08b1bf5d924022ef421cb9ed35e7154068c