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

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@1456574 13f79535-47bb-0310-9956-ffa450edef68