Fix. UTF-8 issue for StringHttpMessageConverter
Resolving merge conflicts