OPENJPA-2236 - back port from 2.2.x to 2.1.x

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