OPENJPA-2233: Merge changes from trunk.

git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/2.3.x@1551447 13f79535-47bb-0310-9956-ffa450edef68