Updated scripts according to new specifications refs #15669
Merge branch 'master' of https://github.com/eea/eea.elasticsearch