WINDUP-152 map in props

See the jira. Core reformat if okay to merge.
It is probably better to iterate over Map.Entry here, rather than using key and a lookup. That's a pretty minor nitpick though. :)