WINDUP-152 map in props

See the jira. Will reformat if okay to merge.
I think Object is fine. Storing unserializable things would probably throw an exception anyway.