GCP-5524 bug fixes
Merge branch 'master' of https://github.com/digitalabs/DatasetImporter