Support scopes with spaces in the name
Merge pull request #2868 from phiyangt/2867-fix-scope-id-collisions

Support scopes with spaces in the name