https://issues.apache.org/jira/browse/TOMEE-1054
bug fix and a few cosmetic changes.

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/trunk@1530970 13f79535-47bb-0310-9956-ffa450edef68