Resurrect importer-cli (Fix #11863)
Fix whitespace in dist.xml
Modify importer-cli to work on mac
Merge pull request #2010 from joshmoore/rebased/develop/11863-import-cli

11863 importer cli (rebased onto develop)