OPENJPA-2410 : Merge checkstyle changes.

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