OPENJPA-2283 : Merge changes from 2.3.x to trunk.

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