fix role assignment if import error occurs

[couthcommander]

In addition to #485, this also changes behavior that completes #464

[jubilee2]

The changes look solid — the inline conflict handling with on.exit makes the restore logic much safer and easier to follow. I appreciate the added test ensuring role assignments remain intact even if importUsers fails.

@obregos , have you had a chance to run the unit tests locally to confirm everything passes

[obregos]

@jubilee2 all tests are passing [ FAIL 0 | WARN 0 | SKIP 12 | PASS 2058 ]

[jubilee2]

Thank you Savannah