Issue #2362703 by joestewart - import_8 ineffective.
Detect and update default site name, if needed.
Cleanup.