OPENJPA-2233: Merge changes to trunk.

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