upgrading map to v7.. additional cleanup

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1584674 13f79535-47bb-0310-9956-ffa450edef68
broken test cleanup routine

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1584675 13f79535-47bb-0310-9956-ffa450edef68
upgrading map to v7.. additional cleanup

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/trunk@1584676 13f79535-47bb-0310-9956-ffa450edef68
broken test cleanup routine

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