Fix https://issues.apache.org/jira/browse/OPENEJB-1996
Fix https://issues.apache.org/jira/browse/OPENEJB-1995

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