elasticsearch 1.x breaking changes

all fine now

closes #2427