OPENJPA-722 resolution - merge back from trunk.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/0.9.7-r547073@719148 13f79535-47bb-0310-9956-ffa450edef68
4 files changed