Merge "Remove unnecessary unset for project-scoped token in glance"