IDEX-1147 simplify project type resolver, remove unused code
Merge remote-tracking branch 'origin/master'