CAY-1806  Error importing eomodel

3.2 patch adaptaion for 3.1

git-svn-id: https://svn.apache.org/repos/asf/cayenne/main/branches/STABLE-3.1@1467181 13f79535-47bb-0310-9956-ffa450edef68