CAY-1806  Error importing eomodel

(cherry picked from commit 58d2a4c7c5b6db87fbd6ef1a387207dc418f6b3e)

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