Misc fixes.

- Add @Martin-Grunewald as watcher.
- Fix mappings for test Elasticsearch instance.