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

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