move more crap into corehq.elastic