CDB-1788 Ongoing plug of the datasources service into existing import system (another commit to stash changes and switch branch)