[BACKLOG-872] Restructure Data Access to allow for deterministic build
Merge pull request #583 from mdamour1976/clenup

[BACKLOG-872] Restructure Data Access to allow for deterministic build
[BACKLOG-872] Fixes due to the introduction of the Property type in
metdata's "thin model".