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

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

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