merge property map for import and export

why would they ever need to be different?
There was maybe/probably a bug lurking behind their being different.

Change-Id: I5db7f1596aec0d2a504ec7901c001054fd7fd121