Merge pull request #17542 from estesp/restart-root-dir-cleanup

Fix integration-cli daemon restart with user namespaces enabled