Fix AMO stats following ES 1.0 preparation
Merge pull request #1847 from diox/fix-amo-stats-es

Fix AMO stats following ES 1.0 preparation