Merge pull request #508 from scottyaslan/devBranch

[BACKLOG-290] Update DataSourceWizardResource for oemdoc
[BACKLOG-290] Updates for oemdoc