WINDUP-152 map in props

See the jira. Will reformat if okay to merge.
We need to have a discussion on naming these two. I agree that they are different and could be useful at different times, but the names don't make that clear, IMO.