Updated scripts for #18419
Merge branch 'master' of ssh://github.com/eea/eea.elasticsearch