[BACKLOG-407] Fixed a bug with overwriting an existing datasource
Merge pull request #1930 from bmorrise/dev

[BACKLOG-407] Fixed a bug with overwriting an existing datasource