Modified map and list property handling.  Added escape characters, and replaced map key/value
separator with an = sign.

Change-Id: I5f2498f27173c4acf2d78239696087d287ce0580