Merge "Fix isolated cred cleanup for cli tests"