MANTA-2401 fixed a few missed cases of old RBAC environment variable handling for CLI tools