Merge pull request #509 from scottyaslan/devBranch

[BACKLOG-290] Updates for oemdoc
[BACKLOG-503] Clean up data access