CDB-2837 Merged Luisico changes

No need to wait for tests as only changes the cdb_import shell script