CAY-1924 Upgrade of a project to v7 with cross-map inheritance loses super entity

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1585092 13f79535-47bb-0310-9956-ffa450edef68
upgrading test project to v7

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