Resolve "ElasticSearch upgrade for v1.x"

Closes #760 (closed)

@mscheidg: Luckily I did not have to change that much, see the issue for the changes I did. How do we go from here? Will you just merge and then we deploy this to beta? The old indices should work, at least that's what ES says in their docs.