[fix bug 907933] Changes in the codebase for the ElasticSearch upgrade.