WINDUP-152  Support for Map<String, String>  - improvements, apply PR comments.