Fix ES tests on amo
Merge pull request #1642 from magopian/fix-es-tests

Fix bug 858447, bug 960598 and bug 961139

* Fix ES tests on amo (bug 858447)
* addons pile up between test runs (bug 960598)
* use cache-machine's LocMemCache backend (bug 961139)