Revert "[BACKLOG-872] Fixes due to the introduction of the Property object in metadata."
Merge pull request #544 from pentaho/revert-539-cleanup

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