Keep smart folders when sorting. (see #12294)
Remove commented code and comments

No longer required.
Make sure the smart folder is always at the bottom.
Add integration test for CLI import as functionality
Refactor sudo_args and add failing test for multi-group CLI import as
Mark multi-group import as test as xfail
Add failing to test for regular import in multi-group
Merge pull request #2549 from jburel/orphaned-missing

Orphaned missing
Merge pull request #2570 from sbesson/cli_importsudo

Add integration tests for CLI import as