[BACKLOG-872] Fixes due to the introduction of the Property object in
metadata.
Merge pull request #539 from e-cuellar/cleanup

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