OPENJPA-2410: Merge checkstyle changes from trunk to 2.2.x .

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