2.5, 2.2 bug fix
2.5, 2.2 bug fix
2.1, 2.2, 2.5: low water mark fix
2.5 fix
elasticsearch update and fix to index file