[BACKLOG-503] Data access oemdoc updates to reflect actual examples from jmeter testing.
Merge pull request #516 from scottyaslan/devBranch5.2

[BACKLOG-503] Data access oemdoc updates to reflect actual examples from...
Fixed NPE due to "datasource" becoming part of "dswId"
Merge pull request #519 from e-cuellar/5.2

Fixed NPE due to "datasource" becoming part of "dswId"