[BACKLOG-407] Fixed a bug with overwriting existing datasources
Merge pull request #492 from bmorrise/dev

[BACKLOG-407] Fixed a bug with overwriting existing datasources