Checkin VS auto-modifications to kproj files
Layout specification and discovery should follow the same behavior as
partials

Fixes #1047
React to DI changes