Merge "make elastic index configurable rather than settled in code"