Pu elasticsearch

If you rebase your branch to latest pu it should be fine ;-)

There were quite a lot of things going on lately