Do not use anymore cluster_* for ES (bug 1083519)
Merge pull request #331 from davidbgk/1083519-es-bump-fixes

Do not use anymore cluster_* for ES (bug 1083519)