Tomislav Nikić authored Jul 30, 2019 and Mark Lapierre committed Jul 30, 2019

This commit covers all the files that where changed in the
identically named branch on EE that is creating an elasticsearch
test case.