Resurrect importer-cli (Fix #11863)
Fix whitespace in dist.xml
Modify importer-cli to work on mac