TRUNK-4209: Fix N+1 select issues on Concept subentities
Merge pull request #505 from endeepak/TRUNK-4209

TRUNK-4209: Fix N+1 select issues on Concept subentities