[BACKLOG-872] Fixes due to the introduction of the Property type in
metadata.
[PRD-5184] Fixing downstream impact from commit to pentaho-reporting
Merge pull request #22 from mdamour1976/master

[PRD-5184] Fixing downstream impact from commit to pentaho-reporting
[BACKLOG-872] Rollback fixes due to the introduction of the Property
type in metadata