OPENJPA-2305: Revert to previous style of generated metamodel as flattening inherited variables violate the spec