merge noamt/elasticsearch-grails-plugin head