Merge pull request #504 from scottyaslan/devBranch

[BACKLOG-290] Service Layer Tests for data access DataSourceWizardServic...
Merge pull request #505 from scottyaslan/devBranch

[BACKLOG-290] updates to the DataSourceWizardServiceTest
Backlog-407 -  Added more defensive code around restoring the password when a user is just trying to create a new connection vs when editing an existing one.
Merge pull request #506 from wseyler/dev

Backlog-407 -  Added more defensive code around restoring the password w...
[BACKLOG-290] Updates to data access oemdoc