Attaching a begining of work as HSEARCH-2771_withouttests.patch . This doesn't include the tests, and doesn't include special handling of normalizers on Elasticsearch.