reverting TOMEE-727 and more finalizing versions


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