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)
Commit from Mozilla Verbatim by user yfdyh000.: 2994 of 2994 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 2994 of 2994 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 2994 of 2994 strings translated (0 fuzzy).
Merge branch 'master' of github.com:mozilla/olympia
Commit from Mozilla Verbatim by user petercpg@mail.moztw.org.: 2994 of 2994 strings translated (0 fuzzy).
Commit from Mozilla Verbatim by user markh@babelzilla.org.: 2994 of 2994 strings translated (0 fuzzy).