HSEARCH-1580 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 and later
fixed in 4.4 and 4.5 - see HSEARCH-1573 for the related history.