Cleanup and finals in preparation and research on https://issues.apache.org/jira/browse/OPENEJB-2046
Various tweaks.

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