OPENJPA-2368 Revert accidental inclusions to the last commit

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