Add support for text and keyword data types

[gmarz]

https://www.elastic.co/guide/en/elasticsearch/reference/master/breaking_50_mapping_changes.html#_literal_string_literal_fields_replaced_by_literal_text_literal_literal_keyword_literal_fields

Mark string as obsolete in 2.x (#1988)

[gmarz]

Closed via be14c87