[BACKLOG-872] Fixes due to the introduction of the Property type in
metadata.
Merge pull request #2168 from e-cuellar/master

[BACKLOG-872] Fixes due to the introduction of the Property type in metadata.