[BACKLOG-872] Fixes due to the introduction of the Property type in
metdata's "thin model".
Merge pull request #584 from e-cuellar/master

[BACKLOG-872] Fixes due to the introduction of the Property type in metdata's "thin model".