Merge pull request #500 from scottyaslan/devBranch

[BACKLOG-290] Service Layer Test for data access AnalysisService
[BACKLOG-627] disable modeler edit button for DSWs not created by wizard
Merge pull request #501 from tgf/modelerEditButtonImportedDsw

[BACKLOG-627] disable modeler edit button for DSWs not created by wizard
[BACKLOG-290] Service Layer Tests for data access DataSourceWizardService