Fix a misnamed settings

At some point Elasticsearch switched the default merge strategy and our
old setting no longer did anything.  This new one is the correct setting.

Change-Id: I2329f2263b39a7a1b34be72396f15d55f1dc00a3
Merge "Fix a misnamed settings"