Fix tenant-awareness for `trusted-root` command#9638

bdehamer merged 2 commits intotrunkcli/cli:trunkfrom

bdehamer/att-trusted-root-tenant-awarecli/cli:bdehamer/att-trusted-root-tenant-awareCopy head branch name to clipboard