OPENJPA-2285 : Revert previous changes to 2.2.x.

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