Merge pull request #518 from e-cuellar/master

Fixed NPE due to "datasource" becoming part of "dswId"
[BACKLOG-739] Added the /dsw/import JMeter test
Merge pull request #521 from bmorrise/dev

[BACKLOG-739] Added the /dsw/import JMeter test
Fixed. Sucessfuly importing always reports an error by default.