WINDUP-152 map in props

See the jira. Core reformat if okay to merge.
I'm not sure why this should be restricted to <String, String>?