Adding new ES feature, updating jaggery version and test fixes