Revert "[BACKLOG-872] Fixes due to the introduction of the Property type in metadata."
Merge pull request #2170 from pentaho/revert-2168-master

Revert "[BACKLOG-872] Fixes due to the introduction of the Property type...