Fix resolving Select(ThisProject)
Add scripted test to verify ThisProject is resolved properly
Merge pull request #1358 from dansanduleac/issue/1194

Resolve ThisProject properly