METAGEN-85 Fixing typo and some raw type warnings
METAGEN-85 Merging members for embeddedables and mapped superclasses lazily in order to consider only members with correct access type