Remove common part of path from VS filters when generating workspaces
Merge branch 'nextgen' into filter-generation
Merge remote-tracking branch 'hymerman/filter-generation' into nextgen