[BISERVER-12093] - Cannot delete invalid Data Source - implementation of determining catalog name was corrected.
Merge pull request #588 from mdamour1976/master

[BACKLOG-872] Restructure Data Access to allow for deterministic build
Merge pull request #582 from MikhailGorbachev/BISERVER-12093

[BISERVER-12093] - Cannot delete invalid Data Source