OPENJPA-2410: Merge checkstyle changes from trunk.

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