Re-added semantic colorization fix for colliding types colliding in value and namespace space, added a test.
Merge pull request #867 from Microsoft/reAddColorizationFix

Restored semantic colorization fix