HSEARCH-1573 Take into account @ContainedIn annotations even if there is no corresponding @IndexedEmbedded

This patch brings back the behavior observed before a refactoring committed during the 4.4 cycle.